appium-ios-simulator 6.1.16 → 6.1.17
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 +6 -0
- package/build/lib/defaults-utils.js +2 -2
- package/build/lib/defaults-utils.js.map +1 -1
- package/build/lib/device-utils.js +2 -5
- package/build/lib/device-utils.js.map +1 -1
- package/build/lib/extensions/applications.js +5 -5
- package/build/lib/extensions/applications.js.map +1 -1
- package/build/lib/extensions/geolocation.js +1 -1
- package/build/lib/extensions/geolocation.js.map +1 -1
- package/build/lib/extensions/misc.d.ts.map +1 -1
- package/build/lib/extensions/misc.js +0 -2
- package/build/lib/extensions/misc.js.map +1 -1
- package/build/lib/extensions/permissions.js +1 -1
- package/build/lib/extensions/permissions.js.map +1 -1
- package/build/lib/extensions/safari.js +2 -2
- package/build/lib/extensions/safari.js.map +1 -1
- package/build/lib/simulator-xcode-10.d.ts +1 -1
- package/build/lib/simulator-xcode-10.d.ts.map +1 -1
- package/build/lib/simulator-xcode-10.js +6 -6
- package/build/lib/simulator-xcode-10.js.map +1 -1
- package/build/lib/simulator-xcode-15.js +2 -2
- package/build/lib/simulator-xcode-15.js.map +1 -1
- package/build/lib/simulator.d.ts.map +1 -1
- package/build/lib/simulator.js +37 -20
- package/build/lib/simulator.js.map +1 -1
- package/build/lib/utils.d.ts +7 -0
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +27 -13
- package/build/lib/utils.js.map +1 -1
- package/lib/defaults-utils.js +1 -1
- package/lib/device-utils.js +1 -1
- package/lib/extensions/applications.js +5 -5
- package/lib/extensions/geolocation.js +1 -1
- package/lib/extensions/misc.js +0 -2
- package/lib/extensions/permissions.js +1 -1
- package/lib/extensions/safari.js +2 -2
- package/lib/extensions/settings.js +2 -2
- package/lib/simulator-xcode-10.js +5 -5
- package/lib/simulator-xcode-15.js +2 -2
- package/lib/simulator.js +3 -20
- package/lib/utils.js +20 -4
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [6.1.17](https://github.com/appium/appium-ios-simulator/compare/v6.1.16...v6.1.17) (2025-01-05)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Bump @appium/eslint-config-appium-ts from 0.3.3 to 1.0.1 ([#443](https://github.com/appium/appium-ios-simulator/issues/443)) ([b387d8d](https://github.com/appium/appium-ios-simulator/commit/b387d8d5933510d104cfb3a697a2b3b56fb929fc))
|
|
6
|
+
|
|
1
7
|
## [6.1.16](https://github.com/appium/appium-ios-simulator/compare/v6.1.15...v6.1.16) (2024-12-12)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
|
@@ -10,7 +10,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
10
10
|
const xmldom_1 = require("@xmldom/xmldom");
|
|
11
11
|
const teen_process_1 = require("teen_process");
|
|
12
12
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
13
|
-
const logger_1 =
|
|
13
|
+
const logger_1 = require("./logger");
|
|
14
14
|
/**
|
|
15
15
|
* Serializes the given value to plist-compatible
|
|
16
16
|
* XML representation, which is ready for further usage
|
|
@@ -108,7 +108,7 @@ function generateDefaultsCommandArgs(valuesMap, replace = false) {
|
|
|
108
108
|
}
|
|
109
109
|
catch (e) {
|
|
110
110
|
if (e instanceof TypeError) {
|
|
111
|
-
logger_1.
|
|
111
|
+
logger_1.log.warn(e.message);
|
|
112
112
|
}
|
|
113
113
|
else {
|
|
114
114
|
throw e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults-utils.js","sourceRoot":"","sources":["../../lib/defaults-utils.js"],"names":[],"mappings":";;;;;;AAkBA,4BAyCC;AAeD,kEAgCC;AA1GD,oDAAuB;AACvB,2CAA0D;AAC1D,+CAAoC;AACpC,wDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"defaults-utils.js","sourceRoot":"","sources":["../../lib/defaults-utils.js"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getDevices = getDevices;
|
|
7
|
-
const node_simctl_1 =
|
|
4
|
+
const node_simctl_1 = require("node-simctl");
|
|
8
5
|
/**
|
|
9
6
|
* @param {import('@appium/types').StringRecord} [simctlOpts]
|
|
10
7
|
* @returns {Promise<any[]>}
|
|
11
8
|
*/
|
|
12
9
|
async function getDevices(simctlOpts) {
|
|
13
|
-
return await new node_simctl_1.
|
|
10
|
+
return await new node_simctl_1.Simctl(simctlOpts).getDevices();
|
|
14
11
|
}
|
|
15
12
|
//# sourceMappingURL=device-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-utils.js","sourceRoot":"","sources":["../../lib/device-utils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"device-utils.js","sourceRoot":"","sources":["../../lib/device-utils.js"],"names":[],"mappings":";;AAMA,gCAEC;AARD,6CAAqC;AAErC;;;GAGG;AACI,KAAK,UAAU,UAAU,CAAC,UAAU;IACzC,OAAO,MAAM,IAAI,oBAAM,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,CAAC;AACnD,CAAC"}
|
|
@@ -48,7 +48,7 @@ async function getUserInstalledBundleIdsByBundleName(bundleName) {
|
|
|
48
48
|
try {
|
|
49
49
|
return await support_1.plist.parsePlistFile(infoPlist);
|
|
50
50
|
}
|
|
51
|
-
catch
|
|
51
|
+
catch { }
|
|
52
52
|
})());
|
|
53
53
|
}
|
|
54
54
|
const bundleInfos = (await bluebird_1.default.all(bundleInfoPromises)).filter(lodash_1.default.isPlainObject);
|
|
@@ -77,7 +77,7 @@ async function isAppInstalled(bundleId) {
|
|
|
77
77
|
}
|
|
78
78
|
return await support_1.fs.exists(appContainer);
|
|
79
79
|
}
|
|
80
|
-
catch
|
|
80
|
+
catch {
|
|
81
81
|
// get_app_container subcommand fails for system applications,
|
|
82
82
|
// so we try the hidden appinfo subcommand, which prints correct info for
|
|
83
83
|
// system/hidden apps
|
|
@@ -85,7 +85,7 @@ async function isAppInstalled(bundleId) {
|
|
|
85
85
|
const info = await this.simctl.appInfo(bundleId);
|
|
86
86
|
return info.includes('ApplicationType');
|
|
87
87
|
}
|
|
88
|
-
catch
|
|
88
|
+
catch { }
|
|
89
89
|
}
|
|
90
90
|
return false;
|
|
91
91
|
}
|
|
@@ -117,7 +117,7 @@ async function launchApp(bundleId, opts = {}) {
|
|
|
117
117
|
intervalMs: 300
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
|
-
catch
|
|
120
|
+
catch {
|
|
121
121
|
throw new Error(`App '${bundleId}' is not runnning after ${timeoutMs}ms timeout.`);
|
|
122
122
|
}
|
|
123
123
|
}
|
|
@@ -161,7 +161,7 @@ async function scrubApp(bundleId) {
|
|
|
161
161
|
try {
|
|
162
162
|
await this.terminateApp(bundleId);
|
|
163
163
|
}
|
|
164
|
-
catch
|
|
164
|
+
catch { }
|
|
165
165
|
await bluebird_1.default.all(appFiles.map((p) => support_1.fs.rimraf(p)));
|
|
166
166
|
}
|
|
167
167
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applications.js","sourceRoot":"","sources":["../../../lib/extensions/applications.js"],"names":[],"mappings":";;;;;AAYA,gCAEC;AASD,sFAgCC;AASD,wCAiBC;AAQD,8BAEC;AASD,8BAkBC;AAQD,oCAEC;AAQD,oCAEC;AAUD,4BAgBC;AApKD,oDAAuB;AACvB,gDAAwB;AACxB,6CAAkD;AAClD,wDAAyB;AACzB,uCAA4C;AAE5C;;;;;GAKG;AACI,KAAK,UAAU,UAAU,CAAE,GAAG;IACnC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,qCAAqC,CAAE,UAAU;IACrE,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IACpF,qEAAqE;IACrE,MAAM,UAAU,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE;QACrD,GAAG,EAAE,QAAQ;QACb,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,IAAI,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YAClC,IAAI,CAAC;gBACH,OAAO,MAAM,eAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC/C,CAAC;YAAC,
|
|
1
|
+
{"version":3,"file":"applications.js","sourceRoot":"","sources":["../../../lib/extensions/applications.js"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ async function setLocationWithLyft(udid, latitude, longitude) {
|
|
|
47
47
|
try {
|
|
48
48
|
await support_1.fs.which(LYFT_SET_LOCATION);
|
|
49
49
|
}
|
|
50
|
-
catch
|
|
50
|
+
catch {
|
|
51
51
|
throw new Error(`'${LYFT_SET_LOCATION}' binary has not been found in your PATH. ` +
|
|
52
52
|
'Please install it as "brew install lyft/formulae/set-simulator-location" by brew or ' +
|
|
53
53
|
'read https://github.com/MobileNativeFoundation/set-simulator-location to set ' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geolocation.js","sourceRoot":"","sources":["../../../lib/extensions/geolocation.js"],"names":[],"mappings":";;AAgBA,wCAiBC;AAjCD,6CAAoC;AACpC,+CAAoC;AAEpC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAEnD;;;;;;;;;;GAUG;AACI,KAAK,UAAU,cAAc,CAAE,QAAQ,EAAE,SAAS;IACvD,MAAM,eAAe,GAAG;QACtB,KAAK,IAAI,EAAE,CAAC,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC;QACrE,KAAK,IAAI,EAAE,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC;KACpE,CAAC;IAEF,IAAI,SAAS,CAAC;IACd,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,MAAM,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzB,SAAS,GAAG,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IACD,MAAM,SAAS,CAAC;AAClB,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,mBAAmB,CAAE,IAAI,EAAE,QAAQ,EAAE,SAAS;IAC3D,IAAI,CAAC;QACH,MAAM,YAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpC,CAAC;IAAC,
|
|
1
|
+
{"version":3,"file":"geolocation.js","sourceRoot":"","sources":["../../../lib/extensions/geolocation.js"],"names":[],"mappings":";;AAgBA,wCAiBC;AAjCD,6CAAoC;AACpC,+CAAoC;AAEpC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAEnD;;;;;;;;;;GAUG;AACI,KAAK,UAAU,cAAc,CAAE,QAAQ,EAAE,SAAS;IACvD,MAAM,eAAe,GAAG;QACtB,KAAK,IAAI,EAAE,CAAC,MAAM,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC;QACrE,KAAK,IAAI,EAAE,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC;KACpE,CAAC;IAEF,IAAI,SAAS,CAAC;IACd,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,MAAM,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzB,SAAS,GAAG,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IACD,MAAM,SAAS,CAAC;AAClB,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,mBAAmB,CAAE,IAAI,EAAE,QAAQ,EAAE,SAAS;IAC3D,IAAI,CAAC;QACH,MAAM,YAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,IAAI,iBAAiB,4CAA4C;YAC/E,sFAAsF;YACtF,+EAA+E;YAC/E,oEAAoE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAA,mBAAI,EAAC,iBAAiB,EAAE;YAC5B,IAAI,EAAE,GAAG,QAAQ,EAAE,EAAE,GAAG,SAAS,EAAE;YACnC,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,mCAAmC,iBAAiB,KAAK;YACvE,mBAAmB,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,kBAAkB,CAAE,GAAG,EAAE,QAAQ,EAAE,SAAS;IACzD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,8GAA8G,CAAC,CAAC;IAClI,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAClG,CAAC;AACH,CAAC;AAED;;GAEG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/extensions/misc.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,0EAMC;AAED;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/extensions/misc.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,0EAMC;AAED;;;;;;;;;GASG;AACH,6EALW,MAAM,SACN,OAAO,UAAU,EAAE,kBAAkB,GACnC,OAAO,CAAC,OAAO,CAAC,CAK5B;AAED;;;;;;;GAOG;AACH,+EAJW,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,IAAI,CAAC,CAKzB;4CAGY,OAAO,UAAU,EAAE,aAAa,GAAG,OAAO,UAAU,EAAE,eAAe"}
|
|
@@ -25,7 +25,6 @@ async function shake() {
|
|
|
25
25
|
* @returns {Promise<boolean>} `true` if the certificate has been successfully installed
|
|
26
26
|
* or `false` if it has already been there
|
|
27
27
|
*/
|
|
28
|
-
// eslint-disable-next-line require-await
|
|
29
28
|
async function addCertificate(payload, opts = {}) {
|
|
30
29
|
throw new Error(`Xcode SDK '${this.xcodeVersion}' is too old add certificates`);
|
|
31
30
|
}
|
|
@@ -37,7 +36,6 @@ async function addCertificate(payload, opts = {}) {
|
|
|
37
36
|
* @returns {Promise<void>}
|
|
38
37
|
* @since Xcode SDK 11.4
|
|
39
38
|
*/
|
|
40
|
-
// eslint-disable-next-line require-await
|
|
41
39
|
async function pushNotification(payload) {
|
|
42
40
|
throw new Error(`Xcode SDK '${this.xcodeVersion}' is too old to push notifications`);
|
|
43
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../lib/extensions/misc.js"],"names":[],"mappings":";AAAA,sDAAsD;;AAMtD,sBAMC;
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../lib/extensions/misc.js"],"names":[],"mappings":";AAAA,sDAAsD;;AAMtD,sBAMC;AAYD,wCAEC;AAUD,4CAEC;AApCD;;;GAGG;AACI,KAAK,UAAU,KAAK;IACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,IAAI,CAAC,IAAI,YAAY,CAAC,CAAC;IACpE,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;QAC7B,YAAY;QACZ,IAAI,EAAE,gCAAgC;KACvC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,cAAc,CAAE,OAAO,EAAE,IAAI,GAAG,EAAE;IACtD,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,YAAY,+BAA+B,CAAC,CAAC;AAClF,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,gBAAgB,CAAE,OAAO;IAC7C,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,YAAY,oCAAoC,CAAC,CAAC;AACvF,CAAC;AAED;;GAEG"}
|
|
@@ -118,7 +118,7 @@ async function execWix(args) {
|
|
|
118
118
|
try {
|
|
119
119
|
await support_1.fs.which(WIX_SIM_UTILS);
|
|
120
120
|
}
|
|
121
|
-
catch
|
|
121
|
+
catch {
|
|
122
122
|
throw new Error(`${WIX_SIM_UTILS} binary has not been found in your PATH. ` +
|
|
123
123
|
`Please install it ('brew tap wix/brew && brew install wix/brew/applesimutils') to ` +
|
|
124
124
|
`be able to change application permissions`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../lib/extensions/permissions.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../lib/extensions/permissions.js"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ async function openUrl(url) {
|
|
|
58
58
|
intervalMs: 500,
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
|
-
catch
|
|
61
|
+
catch {
|
|
62
62
|
const secondsElapsed = timer.getDuration().asSeconds;
|
|
63
63
|
if (psError) {
|
|
64
64
|
this.log.warn(`Mobile Safari process existence cannot be verified after ${secondsElapsed.toFixed(3)}s. ` +
|
|
@@ -83,7 +83,7 @@ async function scrubSafari(keepPrefs = true) {
|
|
|
83
83
|
try {
|
|
84
84
|
await this.terminateApp(utils_1.MOBILE_SAFARI_BUNDLE_ID);
|
|
85
85
|
}
|
|
86
|
-
catch
|
|
86
|
+
catch { }
|
|
87
87
|
this.log.debug('Scrubbing Safari data files');
|
|
88
88
|
const safariData = await this.simctl.getAppContainer(utils_1.MOBILE_SAFARI_BUNDLE_ID, 'data');
|
|
89
89
|
const libraryDir = path_1.default.resolve(safariData, 'Library');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safari.js","sourceRoot":"","sources":["../../../lib/extensions/safari.js"],"names":[],"mappings":";;;;;AA4BA,0BAmCC;AASD,kCAaC;AAmBD,oDAQC;AAMD,sDA2BC;AAjJD,oDAAuB;AACvB,gDAAwB;AACxB,6CAA6C;AAC7C,wDAAyB;AACzB,oCAA8E;AAC9E,uCAA4C;AAC5C,+CAAoC;AAEpC,0EAA0E;AAC1E,yBAAyB;AACzB,MAAM,UAAU,GAAG;IACjB,CAAC,QAAQ,EAAE,GAAG,CAAC;IACf,CAAC,aAAa,EAAE,GAAG,CAAC;IACpB,CAAC,QAAQ,EAAE,+BAAuB,EAAE,GAAG,CAAC;IACxC,CAAC,QAAQ,EAAE,wBAAwB,CAAC;IACpC,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC;IACjC,CAAC,QAAQ,EAAE,GAAG,CAAC;IACf,CAAC,SAAS,EAAE,iBAAiB,CAAC;IAC9B,CAAC,IAAI,EAAE,KAAK,EAAE,+BAAuB,EAAE,GAAG,CAAC;CAC5C,CAAC;AAEF;;;;;;GAMG;AACI,KAAK,UAAU,OAAO,CAAE,GAAG;IAChC,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,yCAAyC,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,mCAAmC;IACnC,IAAI,OAAO,CAAC;IACZ,IAAI,CAAC;QACH,MAAM,IAAA,2BAAgB,EAAC,KAAK,IAAI,EAAE;YAChC,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC;gBAC3B,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC1B,OAAO,GAAG,CAAC,CAAC;YACd,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,KAAK,+BAAuB,CAAC,CAAC;QACrE,CAAC,EAAE;YACD,MAAM,EAAE,iCAAyB;YACjC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,
|
|
1
|
+
{"version":3,"file":"safari.js","sourceRoot":"","sources":["../../../lib/extensions/safari.js"],"names":[],"mappings":"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"}
|
|
@@ -278,7 +278,7 @@ export type HasMiscFeatures = import("./types").HasMiscFeatures;
|
|
|
278
278
|
export type InteractsWithSafariBrowser = import("./types").InteractsWithSafariBrowser;
|
|
279
279
|
export type SupportsBiometric = import("./types").SupportsBiometric;
|
|
280
280
|
import EventEmitter from 'events';
|
|
281
|
-
import Simctl from 'node-simctl';
|
|
281
|
+
import { Simctl } from 'node-simctl';
|
|
282
282
|
import * as appExtensions from './extensions/applications';
|
|
283
283
|
import * as safariExtensions from './extensions/safari';
|
|
284
284
|
import * as biometricExtensions from './extensions/biometric';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulator-xcode-10.d.ts","sourceRoot":"","sources":["../../lib/simulator-xcode-10.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"simulator-xcode-10.d.ts","sourceRoot":"","sources":["../../lib/simulator-xcode-10.js"],"names":[],"mappings":"AA2BA;;;;;;;;;GASG;AAEH;;;;;;;;;GASG;AACH,uEATgB,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,0BAA0B,EAC1B,iBAAiB;IAY/B;;;;;;OAMG;IACH,kBAJW,MAAM,gBACN,OAAO,cAAc,EAAE,YAAY,QACnC,OAAO,eAAe,EAAE,YAAY,OAAC,EAiB/C;IA/BD,oCAAoC;IACpC,sBADW,MAAM,GAAC,SAAS,GAAC,IAAI,CACX;IAErB,oCAAoC;IACpC,kBADW,MAAM,GAAC,SAAS,GAAC,IAAI,CACf;IAEjB,oCAAoC;IACpC,qBADW,MAAM,GAAC,SAAS,GAAC,IAAI,CACZ;IAYlB,cAAyB;IACzB,gBAEE;IACF,mEAAiC;IAKjC,UAAgB;IAEhB,2CAA6B;IAG/B;;OAEG;IACH,YAFa,MAAM,CAIlB;IAED;;OAEG;IACH,cAFa,MAAM,CAIlB;IAED;;OAEG;IACH,oBAFa,OAAO,cAAc,EAAE,YAAY,CAI/C;IAED;;OAEG;IACH,oBAFa,MAAM,CAIlB;IAED;;OAEG;IACH,WAFY,OAAO,eAAe,EAAE,YAAY,CAI/C;IAED;;OAEG;IACH,wBAFY,MAAM,CAIjB;IAED;;OAEG;IACH,sBAFY,MAAM,CAIjB;IAUD;;;;;;;OAOG;IACH,0BAHY,MAAM,OAAA,EAKjB;IAlBD;;;OAGG;IACH,sBAHa,MAAM,OAAA,CAKlB;IAcD;;;;OAIG;IACH,eAFW,GAAG,EAIb;IAED;;OAEG;IACH,WAFY,OAAO,CAAC,GAAG,CAAC,CAIvB;IAED;;;;OAIG;IACH,cAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,UAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,aAFY,MAAM,CAIjB;IAED;;;;;;;;;OASG;IACH,QAPY,OAAO,CAAC,OAAO,SAAS,EAAE,UAAU,GAAC,OAAO,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAkB5F;IAED;;;;;OAKG;IACH,WAFY,OAAO,CAAC,OAAO,CAAC,CAO3B;IAED;;;;;OAKG;IACH,aAFY,OAAO,CAAC,OAAO,CAAC,CAS3B;IAED;;;;;;;OAOG;IACH,cAFY,OAAO,CAAC,OAAO,CAAC,CAS3B;IAED;;;;OAIG;IACH,kBAFY,OAAO,CAAC,MAAM,GAAC,IAAI,CAAC,CAe/B;IAED;;;;OAIG;IACH,qBAFY,OAAO,CAAC,OAAO,CAAC,CAI3B;IAED;;;;OAIG;IACH,sBAFY,OAAO,CAAC,MAAM,CAAC,CAQ1B;IAED;;;;;;OAMG;IACH,sBA0BC;IAED;;;;;OAKG;IACH,4BAFW,MAAM,iBAIhB;IAED;;;OAGG;IACH,uBAGC;IAED;;OAEG;IACH,wBAEC;IAED;;;;;;OAMG;IACH,gBAJW,OAAO,SAAS,EAAE,eAAe,iBAqB3C;IAED;;;;;OAKG;IACH,gCAHW,OAAO,SACP,OAAO,SAAS,EAAE,UAAU,iBAOtC;IAED;;;;OAIG;IACH,qBAFW,OAAO,SAAS,EAAE,oBAAoB,iBAiBhD;IAED;;;;;OAKG;IACH,WAFW,OAAO,SAAS,EAAE,UAAU,iBAkEtC;IAED;;;;;;;OAOG;IACH,oBALW,OAAO,SAAS,EAAE,mBAAmB,GACpC,OAAO,CAAC,OAAO,CAAC,CAwB3B;IAED;;;;;;;;OAQG;IACH,MAJY,OAAO,CAAC,OAAO,SAAS,EAAE,WAAW,EAAE,CAAC,CAoCnD;IAED;;OAEG;IACH,wBAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;IAED,4CAAsC;IACtC,kGAA4F;IAC5F,oDAA8C;IAC9C,0CAAoC;IACpC,0CAAoC;IACpC,gDAA0C;IAC1C,gDAA0C;IAC1C,wCAAkC;IAElC,yCAAmC;IACnC,iDAA2C;IAC3C,mEAA6D;IAC7D,uBAAmC,MAAM,OAAO,CAAC,MAAM,GAAC,IAAI,CAAC,CAE3D;IAEF,oEAA8D;IAC9D,4DAAsD;IACtD,kEAA4D;IAE5D,4DAAsD;IAEtD,iBAA6B,MAAM,OAAO,CAAC,OAAO,CAAC,CAEjD;IACF,kBAA8B,MAAM,OAAO,CAAC,OAAO,CAAC,CAElD;IACF,yDAAmD;IAEnD,mCAA6B;IAC7B,qDAA+C;IAC/C,yDAAmD;IAEnD,0DAAoD;IACpD,4DAAsD;IACtD,0DAAoD;IAEpD,yDAAmD;IACnD,uDAAiD;IACjD,uDAAiD;IACjD,uEAAiE;IACjE,qEAA+D;IAC/D,2DAAqD;IACrD,uEAAiE;IACjE,mFAA6E;CAC9E;4BAtlBY,OAAO,SAAS,EAAE,aAAa;0BAC/B,OAAO,SAAS,EAAE,WAAW;gCAC7B,OAAO,SAAS,EAAE,iBAAiB;oCACnC,OAAO,SAAS,EAAE,qBAAqB;kCACvC,OAAO,SAAS,EAAE,mBAAmB;8BACrC,OAAO,SAAS,EAAE,eAAe;yCACjC,OAAO,SAAS,EAAE,0BAA0B;gCAC5C,OAAO,SAAS,EAAE,iBAAiB;yBA9BvB,QAAQ;uBAMV,aAAa;+BACL,2BAA2B;kCAExB,qBAAqB;qCADlB,wBAAwB;uCAGtB,0BAA0B;oCAD7B,uBAAuB;gCAI3B,mBAAmB;uCADZ,0BAA0B;oCAD7B,uBAAuB"}
|
|
@@ -48,7 +48,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
48
48
|
const path_1 = __importDefault(require("path"));
|
|
49
49
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
50
50
|
const appium_xcode_1 = require("appium-xcode");
|
|
51
|
-
const node_simctl_1 =
|
|
51
|
+
const node_simctl_1 = require("node-simctl");
|
|
52
52
|
const appExtensions = __importStar(require("./extensions/applications"));
|
|
53
53
|
const biometricExtensions = __importStar(require("./extensions/biometric"));
|
|
54
54
|
const safariExtensions = __importStar(require("./extensions/safari"));
|
|
@@ -128,7 +128,7 @@ class SimulatorXcode10 extends events_1.default {
|
|
|
128
128
|
this.setReduceTransparency = settingsExtensions.setReduceTransparency;
|
|
129
129
|
this.disableKeyboardIntroduction = settingsExtensions.disableKeyboardIntroduction;
|
|
130
130
|
this._udid = String(udid);
|
|
131
|
-
this._simctl = new node_simctl_1.
|
|
131
|
+
this._simctl = new node_simctl_1.Simctl({
|
|
132
132
|
udid: this._udid,
|
|
133
133
|
});
|
|
134
134
|
this._xcodeVersion = xcodeVersion;
|
|
@@ -282,7 +282,7 @@ class SimulatorXcode10 extends events_1.default {
|
|
|
282
282
|
await this.simctl.getEnv('dummy');
|
|
283
283
|
return true;
|
|
284
284
|
}
|
|
285
|
-
catch
|
|
285
|
+
catch {
|
|
286
286
|
return false;
|
|
287
287
|
}
|
|
288
288
|
}
|
|
@@ -313,7 +313,7 @@ class SimulatorXcode10 extends events_1.default {
|
|
|
313
313
|
try {
|
|
314
314
|
({ stdout } = await (0, teen_process_1.exec)('pgrep', ['-fn', `${utils_1.SIMULATOR_APP_NAME}/Contents/MacOS/`]));
|
|
315
315
|
}
|
|
316
|
-
catch
|
|
316
|
+
catch {
|
|
317
317
|
return null;
|
|
318
318
|
}
|
|
319
319
|
if (isNaN(parseInt(stdout, 10))) {
|
|
@@ -422,7 +422,7 @@ class SimulatorXcode10 extends events_1.default {
|
|
|
422
422
|
intervalMs: 100,
|
|
423
423
|
});
|
|
424
424
|
}
|
|
425
|
-
catch
|
|
425
|
+
catch {
|
|
426
426
|
throw new Error(`Simulator is not in 'Shutdown' state after ${waitMs}ms`);
|
|
427
427
|
}
|
|
428
428
|
}
|
|
@@ -493,7 +493,7 @@ class SimulatorXcode10 extends events_1.default {
|
|
|
493
493
|
intervalMs: 100,
|
|
494
494
|
});
|
|
495
495
|
}
|
|
496
|
-
catch
|
|
496
|
+
catch {
|
|
497
497
|
if (!await this.isRunning()) {
|
|
498
498
|
throw new Error(`Simulator with UDID '${this.udid}' cannot be transitioned to headless mode`);
|
|
499
499
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulator-xcode-10.js","sourceRoot":"","sources":["../../lib/simulator-xcode-10.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"simulator-xcode-10.js","sourceRoot":"","sources":["../../lib/simulator-xcode-10.js"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ class SimulatorXcode15 extends simulator_xcode_14_1.SimulatorXcode14 {
|
|
|
25
25
|
const appContainer = await this.simctl.getAppContainer(bundleId);
|
|
26
26
|
return appContainer.endsWith('.app') && await support_1.fs.exists(appContainer);
|
|
27
27
|
}
|
|
28
|
-
catch
|
|
28
|
+
catch {
|
|
29
29
|
// get_app_container subcommand fails for system applications,
|
|
30
30
|
// as well as the hidden appinfo command
|
|
31
31
|
return (await this._fetchSystemAppBundleIds()).has(bundleId);
|
|
@@ -62,7 +62,7 @@ class SimulatorXcode15 extends simulator_xcode_14_1.SimulatorXcode14 {
|
|
|
62
62
|
]);
|
|
63
63
|
return lodash_1.default.trim(stdout);
|
|
64
64
|
}
|
|
65
|
-
catch
|
|
65
|
+
catch {
|
|
66
66
|
return null;
|
|
67
67
|
}
|
|
68
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulator-xcode-15.js","sourceRoot":"","sources":["../../lib/simulator-xcode-15.js"],"names":[],"mappings":";;;;;;AAAA,6CAAqC;AACrC,+CAAoC;AACpC,gDAAwB;AACxB,oDAAuB;AACvB,wDAAyB;AACzB,6DAAwD;AAExD,MAAa,gBAAiB,SAAQ,qCAAgB;IAAtD;;QAiDE;;;;;;WAMG;QACH,mBAAc,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClC,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACjE,OAAO,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,YAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACxE,CAAC;YAAC,
|
|
1
|
+
{"version":3,"file":"simulator-xcode-15.js","sourceRoot":"","sources":["../../lib/simulator-xcode-15.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulator.d.ts","sourceRoot":"","sources":["../../lib/simulator.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"simulator.d.ts","sourceRoot":"","sources":["../../lib/simulator.js"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AACH,mCAPW,MAAM,SACN,OAAO,SAAS,EAAE,sBAAsB,GAIvC,OAAO,CAAC,OAAO,SAAS,EAAE,SAAS,CAAC,CAsD/C"}
|
package/build/lib/simulator.js
CHANGED
|
@@ -1,7 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
5
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
36
|
exports.getSimulator = getSimulator;
|
|
7
37
|
const simulator_xcode_10_1 = require("./simulator-xcode-10");
|
|
@@ -10,21 +40,8 @@ const simulator_xcode_11_4_1 = require("./simulator-xcode-11.4");
|
|
|
10
40
|
const simulator_xcode_14_1 = require("./simulator-xcode-14");
|
|
11
41
|
const simulator_xcode_15_1 = require("./simulator-xcode-15");
|
|
12
42
|
const utils_1 = require("./utils");
|
|
13
|
-
const
|
|
43
|
+
const xcode = __importStar(require("appium-xcode"));
|
|
14
44
|
const logger_1 = require("./logger");
|
|
15
|
-
const MIN_SUPPORTED_XCODE_VERSION = 10;
|
|
16
|
-
/**
|
|
17
|
-
* @template {import('appium-xcode').XcodeVersion} V
|
|
18
|
-
* @param {V} xcodeVersion
|
|
19
|
-
* @returns {V}
|
|
20
|
-
*/
|
|
21
|
-
function handleUnsupportedXcode(xcodeVersion) {
|
|
22
|
-
if (xcodeVersion.major < MIN_SUPPORTED_XCODE_VERSION) {
|
|
23
|
-
throw new Error(`Tried to use an iOS simulator with xcode version ${xcodeVersion.versionString} but only Xcode version ` +
|
|
24
|
-
`${MIN_SUPPORTED_XCODE_VERSION} and up are supported`);
|
|
25
|
-
}
|
|
26
|
-
return xcodeVersion;
|
|
27
|
-
}
|
|
28
45
|
/**
|
|
29
46
|
* Finds and returns the corresponding Simulator instance for the given ID.
|
|
30
47
|
*
|
|
@@ -37,8 +54,8 @@ function handleUnsupportedXcode(xcodeVersion) {
|
|
|
37
54
|
*/
|
|
38
55
|
async function getSimulator(udid, opts = {}) {
|
|
39
56
|
let { platform = 'iOS', checkExistence = true, devicesSetPath, logger, } = opts;
|
|
40
|
-
const xcodeVersion =
|
|
41
|
-
/** @type {import('appium-xcode').XcodeVersion} */ (await
|
|
57
|
+
const xcodeVersion = (0, utils_1.assertXcodeVersion)(
|
|
58
|
+
/** @type {import('appium-xcode').XcodeVersion} */ (await xcode.getVersion(true)));
|
|
42
59
|
if (checkExistence) {
|
|
43
60
|
const simulatorInfo = await (0, utils_1.getSimulatorInfo)(udid, {
|
|
44
61
|
devicesSetPath
|
|
@@ -51,7 +68,7 @@ async function getSimulator(udid, opts = {}) {
|
|
|
51
68
|
(logger ?? logger_1.log).info(`Constructing ${platform} simulator for Xcode version ${xcodeVersion.versionString} with udid '${udid}'`);
|
|
52
69
|
let SimClass;
|
|
53
70
|
switch (xcodeVersion.major) {
|
|
54
|
-
case MIN_SUPPORTED_XCODE_VERSION:
|
|
71
|
+
case utils_1.MIN_SUPPORTED_XCODE_VERSION:
|
|
55
72
|
SimClass = simulator_xcode_10_1.SimulatorXcode10;
|
|
56
73
|
break;
|
|
57
74
|
case 11:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulator.js","sourceRoot":"","sources":["../../lib/simulator.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"simulator.js","sourceRoot":"","sources":["../../lib/simulator.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA,oCAoDC;AAvED,6DAAwD;AACxD,6DAAwD;AACxD,iEAA4D;AAC5D,6DAAwD;AACxD,6DAAwD;AACxD,mCAA4F;AAC5F,oDAAsC;AACtC,qCAA+B;AAE/B;;;;;;;;;GASG;AACI,KAAK,UAAU,YAAY,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE;IACjD,IAAI,EACF,QAAQ,GAAG,KAAK,EAChB,cAAc,GAAG,IAAI,EACrB,cAAc,EACd,MAAM,GACP,GAAG,IAAI,CAAC;IAET,MAAM,YAAY,GAAG,IAAA,0BAAkB;IACrC,kDAAkD,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAClF,CAAC;IACF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE;YACjD,cAAc;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,GAAG,CAAC,CAAC;QACtD,CAAC;QAED,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED,CAAC,MAAM,IAAI,YAAG,CAAC,CAAC,IAAI,CAClB,gBAAgB,QAAQ,gCAAgC,YAAY,CAAC,aAAa,eAAe,IAAI,GAAG,CACzG,CAAC;IACF,IAAI,QAAQ,CAAC;IACb,QAAQ,YAAY,CAAC,KAAK,EAAE,CAAC;QAC3B,KAAK,mCAA2B;YAC9B,QAAQ,GAAG,qCAAgB,CAAC;YAC5B,MAAM;QACR,KAAK,EAAE;YACL,QAAQ,GAAG,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,qCAAgB,CAAC,CAAC,CAAC,yCAAkB,CAAC;YAC1E,MAAM;QACR,KAAK,EAAE,CAAC;QACR,KAAK,EAAE;YACL,QAAQ,GAAG,yCAAkB,CAAC;YAC9B,MAAM;QACR,KAAK,EAAE;YACL,QAAQ,GAAG,qCAAgB,CAAC;YAC5B,MAAM;QACR,KAAK,EAAE,CAAC;QACR;YACE,QAAQ,GAAG,qCAAgB,CAAC;YAC5B,MAAM;IACV,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACxD,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -20,7 +20,14 @@ export function simExists(udid: string): Promise<boolean>;
|
|
|
20
20
|
* @returns {Promise<string>}
|
|
21
21
|
*/
|
|
22
22
|
export function getDeveloperRoot(): Promise<string>;
|
|
23
|
+
/**
|
|
24
|
+
* @template {import('appium-xcode').XcodeVersion} V
|
|
25
|
+
* @param {V} xcodeVersion
|
|
26
|
+
* @returns {V}
|
|
27
|
+
*/
|
|
28
|
+
export function assertXcodeVersion<V extends import("appium-xcode").XcodeVersion>(xcodeVersion: V): V;
|
|
23
29
|
export const SAFARI_STARTUP_TIMEOUT_MS: number;
|
|
24
30
|
export const MOBILE_SAFARI_BUNDLE_ID: "com.apple.mobilesafari";
|
|
25
31
|
export const SIMULATOR_APP_NAME: "Simulator.app";
|
|
32
|
+
export const MIN_SUPPORTED_XCODE_VERSION: 10;
|
|
26
33
|
//# sourceMappingURL=utils.d.ts.map
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAuCA;;;GAGG;AACH,4CAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CA0EzB;AAED;;;;GAIG;AACH,uCAJW,MAAM,SACN;IAAC,cAAc,CAAC,EAAE,MAAM,GAAC,IAAI,CAAA;CAAC,GAC5B,OAAO,CAAC,GAAG,CAAC,CAWxB;AAED;;;GAGG;AACH,gCAHW,MAAM,GACJ,OAAO,CAAC,OAAO,CAAC,CAI5B;AAED;;GAEG;AACH,oCAFa,OAAO,CAAC,MAAM,CAAC,CAK3B;AAED;;;;GAIG;AACH,mCAJmD,CAAC,SAAvC,OAAQ,cAAc,EAAE,YAAa,gBACvC,CAAC,GACC,CAAC,CAUb;AAzJD,+CAAmD;AACnD,sCAAuC,wBAAwB,CAAC;AAChE,iCAAkC,eAAe,CAAC;AAClD,0CAA2C,EAAE,CAAC"}
|
package/build/lib/utils.js
CHANGED
|
@@ -3,12 +3,13 @@ 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.SIMULATOR_APP_NAME = exports.MOBILE_SAFARI_BUNDLE_ID = exports.SAFARI_STARTUP_TIMEOUT_MS = void 0;
|
|
6
|
+
exports.MIN_SUPPORTED_XCODE_VERSION = exports.SIMULATOR_APP_NAME = exports.MOBILE_SAFARI_BUNDLE_ID = exports.SAFARI_STARTUP_TIMEOUT_MS = void 0;
|
|
7
7
|
exports.killAllSimulators = killAllSimulators;
|
|
8
8
|
exports.getSimulatorInfo = getSimulatorInfo;
|
|
9
9
|
exports.simExists = simExists;
|
|
10
10
|
exports.getDeveloperRoot = getDeveloperRoot;
|
|
11
|
-
|
|
11
|
+
exports.assertXcodeVersion = assertXcodeVersion;
|
|
12
|
+
const logger_1 = require("./logger");
|
|
12
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
13
14
|
const teen_process_1 = require("teen_process");
|
|
14
15
|
const asyncbox_1 = require("asyncbox");
|
|
@@ -19,6 +20,7 @@ const DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS = 30000;
|
|
|
19
20
|
exports.SAFARI_STARTUP_TIMEOUT_MS = 25 * 1000;
|
|
20
21
|
exports.MOBILE_SAFARI_BUNDLE_ID = 'com.apple.mobilesafari';
|
|
21
22
|
exports.SIMULATOR_APP_NAME = 'Simulator.app';
|
|
23
|
+
exports.MIN_SUPPORTED_XCODE_VERSION = 10;
|
|
22
24
|
/**
|
|
23
25
|
* @param {string} appName
|
|
24
26
|
* @param {boolean} [forceKill=false]
|
|
@@ -40,7 +42,7 @@ async function pkill(appName, forceKill = false) {
|
|
|
40
42
|
if (!lodash_1.default.isUndefined(err.code)) {
|
|
41
43
|
throw new Error(`Cannot forcefully terminate ${appName}. pkill error code: ${err.code}`);
|
|
42
44
|
}
|
|
43
|
-
logger_1.
|
|
45
|
+
logger_1.log.error(`Received unexpected error while trying to kill ${appName}: ${err.message}`);
|
|
44
46
|
throw err;
|
|
45
47
|
}
|
|
46
48
|
}
|
|
@@ -49,7 +51,7 @@ async function pkill(appName, forceKill = false) {
|
|
|
49
51
|
* @returns {Promise<void>}
|
|
50
52
|
*/
|
|
51
53
|
async function killAllSimulators(timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS) {
|
|
52
|
-
logger_1.
|
|
54
|
+
logger_1.log.debug('Killing all iOS Simulators');
|
|
53
55
|
const xcodeVersion = await (0, appium_xcode_1.getVersion)(true);
|
|
54
56
|
if (lodash_1.default.isString(xcodeVersion)) {
|
|
55
57
|
return;
|
|
@@ -60,7 +62,7 @@ async function killAllSimulators(timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS) {
|
|
|
60
62
|
try {
|
|
61
63
|
await (0, teen_process_1.exec)('xcrun', ['simctl', 'shutdown', xcodeVersion.major > 8 ? 'all' : 'booted'], { timeout });
|
|
62
64
|
}
|
|
63
|
-
catch
|
|
65
|
+
catch { }
|
|
64
66
|
const pids = [];
|
|
65
67
|
try {
|
|
66
68
|
const { stdout } = await (0, teen_process_1.exec)('pgrep', ['-f', `${appName}.app/Contents/MacOS/`]);
|
|
@@ -70,25 +72,25 @@ async function killAllSimulators(timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS) {
|
|
|
70
72
|
}
|
|
71
73
|
catch (e) {
|
|
72
74
|
if (e.code === 1) {
|
|
73
|
-
logger_1.
|
|
75
|
+
logger_1.log.debug(`${appName} is not running. Continuing...`);
|
|
74
76
|
return;
|
|
75
77
|
}
|
|
76
78
|
if (lodash_1.default.isEmpty(pids)) {
|
|
77
|
-
logger_1.
|
|
79
|
+
logger_1.log.warn(`pgrep error ${e.code} while detecting whether ${appName} is running. Trying to kill anyway.`);
|
|
78
80
|
}
|
|
79
81
|
}
|
|
80
82
|
if (!lodash_1.default.isEmpty(pids)) {
|
|
81
|
-
logger_1.
|
|
83
|
+
logger_1.log.debug(`Killing processes: ${pids.join(', ')}`);
|
|
82
84
|
try {
|
|
83
85
|
await (0, teen_process_1.exec)('kill', ['-9', ...(pids.map((pid) => `${pid}`))]);
|
|
84
86
|
}
|
|
85
|
-
catch
|
|
87
|
+
catch { }
|
|
86
88
|
}
|
|
87
|
-
logger_1.
|
|
89
|
+
logger_1.log.debug(`Using pkill to kill application: ${appName}`);
|
|
88
90
|
try {
|
|
89
91
|
await pkill(appName, true);
|
|
90
92
|
}
|
|
91
|
-
catch
|
|
93
|
+
catch { }
|
|
92
94
|
// wait for all the devices to be shutdown before Continuing
|
|
93
95
|
// but only print out the failed ones when they are actually fully failed
|
|
94
96
|
let remainingDevices = [];
|
|
@@ -113,9 +115,9 @@ async function killAllSimulators(timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS) {
|
|
|
113
115
|
}
|
|
114
116
|
catch (err) {
|
|
115
117
|
if (remainingDevices.length > 0) {
|
|
116
|
-
logger_1.
|
|
118
|
+
logger_1.log.warn(`The following devices are still not in the correct state after ${timeout} ms:`);
|
|
117
119
|
for (let device of remainingDevices) {
|
|
118
|
-
logger_1.
|
|
120
|
+
logger_1.log.warn(` ${device}`);
|
|
119
121
|
}
|
|
120
122
|
}
|
|
121
123
|
throw err;
|
|
@@ -148,4 +150,16 @@ async function getDeveloperRoot() {
|
|
|
148
150
|
const { stdout } = await (0, teen_process_1.exec)('xcode-select', ['-p']);
|
|
149
151
|
return stdout.trim();
|
|
150
152
|
}
|
|
153
|
+
/**
|
|
154
|
+
* @template {import('appium-xcode').XcodeVersion} V
|
|
155
|
+
* @param {V} xcodeVersion
|
|
156
|
+
* @returns {V}
|
|
157
|
+
*/
|
|
158
|
+
function assertXcodeVersion(xcodeVersion) {
|
|
159
|
+
if (xcodeVersion.major < exports.MIN_SUPPORTED_XCODE_VERSION) {
|
|
160
|
+
throw new Error(`Tried to use an iOS simulator with xcode version ${xcodeVersion.versionString} but only Xcode version ` +
|
|
161
|
+
`${exports.MIN_SUPPORTED_XCODE_VERSION} and up are supported`);
|
|
162
|
+
}
|
|
163
|
+
return xcodeVersion;
|
|
164
|
+
}
|
|
151
165
|
//# sourceMappingURL=utils.js.map
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;AA2CA,8CAwEC;AAOD,4CASC;AAMD,8BAEC;AAKD,4CAGC;AAOD,gDAQC;AAlKD,qCAA+B;AAC/B,oDAAuB;AACvB,+CAAoC;AACpC,uCAA4C;AAC5C,+CAA0C;AAC1C,gDAAwB;AACxB,iDAA4C;AAE5C,MAAM,+BAA+B,GAAG,KAAK,CAAC;AACjC,QAAA,yBAAyB,GAAG,EAAE,GAAG,IAAI,CAAC;AACtC,QAAA,uBAAuB,GAAG,wBAAwB,CAAC;AACnD,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,2BAA2B,GAAG,EAAE,CAAC;AAE9C;;;;GAIG;AACH,KAAK,UAAU,KAAK,CAAE,OAAO,EAAE,SAAS,GAAG,KAAK;IAC9C,IAAI,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,IAAA,mBAAI,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,0BAA0B;QAC1B,8CAA8C;QAC9C,qCAAqC;QACrC,8DAA8D;QAC9D,sCAAsC;QACtC,IAAI,CAAC,gBAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,uBAAuB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3F,CAAC;QACD,YAAG,CAAC,KAAK,CAAC,kDAAkD,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvF,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAE,OAAO,GAAG,+BAA+B;IAChF,YAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,gBAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,0BAAkB,CAAC,CAAC,IAAI,CAAC;IAEpD,qCAAqC;IACrC,OAAO,GAAG,OAAO,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtD,IAAI,CAAC;QACH,MAAM,IAAA,mBAAI,EAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC;IACpG,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,OAAO,sBAAsB,CAAC,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjB,YAAG,CAAC,KAAK,CAAC,GAAG,OAAO,gCAAgC,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpB,YAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,4BAA4B,OAAO,qCAAqC,CAAC,CAAC;QAC1G,CAAC;IACH,CAAC;IACD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,YAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,IAAA,mBAAI,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,YAAG,CAAC,KAAK,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,4DAA4D;IAC5D,yEAAyE;IACzE,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,KAAK,UAAU,cAAc;QAC3B,gBAAgB,GAAG,EAAE,CAAC;QACtB,IAAI,OAAO,GAAG,MAAM,IAAA,yBAAU,GAAE,CAAC;QACjC,OAAO,GAAG,gBAAC,CAAC,OAAO,CAAC,gBAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,OAAO,gBAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,gBAAgB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG,WAAW,GAAG,CAAC,IAAI,wBAAwB,KAAK,GAAG,CAAC,CAAC;YACpG,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAA,2BAAgB,EAAC,cAAc,EAAE;YACrC,MAAM,EAAE,OAAO;YACf,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,YAAG,CAAC,IAAI,CAAC,kEAAkE,OAAO,MAAM,CAAC,CAAC;YAC1F,KAAK,IAAI,MAAM,IAAI,gBAAgB,EAAE,CAAC;gBACpC,YAAG,CAAC,IAAI,CAAC,OAAO,MAAM,EAAE,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE;IACrD,MAAM,EACJ,cAAc,EACf,GAAG,IAAI,CAAC;IACT,sFAAsF;IACtF,MAAM,OAAO,GAAG,gBAAC,CAAC,OAAO,CAAC,MAAM,IAAA,yBAAU,EAAC,EAAC,cAAc,EAAC,CAAC,CAAC;SAC1D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACtB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrC,OAAO,gBAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AACrD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,SAAS,CAAE,IAAI;IACnC,OAAO,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,gBAAgB;IACpC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAE,YAAY;IAC9C,IAAI,YAAY,CAAC,KAAK,GAAG,mCAA2B,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CACb,oDAAoD,YAAY,CAAC,aAAa,0BAA0B;YACxG,GAAG,mCAA2B,uBAAuB,CACtD,CAAC;IACJ,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
package/lib/defaults-utils.js
CHANGED
|
@@ -2,7 +2,7 @@ import _ from 'lodash';
|
|
|
2
2
|
import { DOMParser, XMLSerializer } from '@xmldom/xmldom';
|
|
3
3
|
import { exec } from 'teen_process';
|
|
4
4
|
import B from 'bluebird';
|
|
5
|
-
import log from './logger';
|
|
5
|
+
import { log } from './logger';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Serializes the given value to plist-compatible
|
package/lib/device-utils.js
CHANGED
|
@@ -37,7 +37,7 @@ export async function getUserInstalledBundleIdsByBundleName (bundleName) {
|
|
|
37
37
|
bundleInfoPromises.push((async () => {
|
|
38
38
|
try {
|
|
39
39
|
return await plist.parsePlistFile(infoPlist);
|
|
40
|
-
} catch
|
|
40
|
+
} catch {}
|
|
41
41
|
})());
|
|
42
42
|
}
|
|
43
43
|
const bundleInfos = (await B.all(bundleInfoPromises)).filter(_.isPlainObject);
|
|
@@ -69,14 +69,14 @@ export async function isAppInstalled (bundleId) {
|
|
|
69
69
|
return false;
|
|
70
70
|
}
|
|
71
71
|
return await fs.exists(appContainer);
|
|
72
|
-
} catch
|
|
72
|
+
} catch {
|
|
73
73
|
// get_app_container subcommand fails for system applications,
|
|
74
74
|
// so we try the hidden appinfo subcommand, which prints correct info for
|
|
75
75
|
// system/hidden apps
|
|
76
76
|
try {
|
|
77
77
|
const info = await this.simctl.appInfo(bundleId);
|
|
78
78
|
return info.includes('ApplicationType');
|
|
79
|
-
} catch
|
|
79
|
+
} catch {}
|
|
80
80
|
}
|
|
81
81
|
return false;
|
|
82
82
|
}
|
|
@@ -113,7 +113,7 @@ export async function launchApp (bundleId, opts = {}) {
|
|
|
113
113
|
waitMs: timeoutMs,
|
|
114
114
|
intervalMs: 300
|
|
115
115
|
});
|
|
116
|
-
} catch
|
|
116
|
+
} catch {
|
|
117
117
|
throw new Error(`App '${bundleId}' is not runnning after ${timeoutMs}ms timeout.`);
|
|
118
118
|
}
|
|
119
119
|
}
|
|
@@ -160,7 +160,7 @@ export async function scrubApp (bundleId) {
|
|
|
160
160
|
|
|
161
161
|
try {
|
|
162
162
|
await this.terminateApp(bundleId);
|
|
163
|
-
} catch
|
|
163
|
+
} catch {}
|
|
164
164
|
await B.all(appFiles.map((p) => fs.rimraf(p)));
|
|
165
165
|
}
|
|
166
166
|
|
|
@@ -46,7 +46,7 @@ export async function setGeolocation (latitude, longitude) {
|
|
|
46
46
|
async function setLocationWithLyft (udid, latitude, longitude) {
|
|
47
47
|
try {
|
|
48
48
|
await fs.which(LYFT_SET_LOCATION);
|
|
49
|
-
} catch
|
|
49
|
+
} catch {
|
|
50
50
|
throw new Error(`'${LYFT_SET_LOCATION}' binary has not been found in your PATH. ` +
|
|
51
51
|
'Please install it as "brew install lyft/formulae/set-simulator-location" by brew or ' +
|
|
52
52
|
'read https://github.com/MobileNativeFoundation/set-simulator-location to set ' +
|
package/lib/extensions/misc.js
CHANGED
|
@@ -22,7 +22,6 @@ export async function shake () {
|
|
|
22
22
|
* @returns {Promise<boolean>} `true` if the certificate has been successfully installed
|
|
23
23
|
* or `false` if it has already been there
|
|
24
24
|
*/
|
|
25
|
-
// eslint-disable-next-line require-await
|
|
26
25
|
export async function addCertificate (payload, opts = {}) {
|
|
27
26
|
throw new Error(`Xcode SDK '${this.xcodeVersion}' is too old add certificates`);
|
|
28
27
|
}
|
|
@@ -35,7 +34,6 @@ export async function addCertificate (payload, opts = {}) {
|
|
|
35
34
|
* @returns {Promise<void>}
|
|
36
35
|
* @since Xcode SDK 11.4
|
|
37
36
|
*/
|
|
38
|
-
// eslint-disable-next-line require-await
|
|
39
37
|
export async function pushNotification (payload) {
|
|
40
38
|
throw new Error(`Xcode SDK '${this.xcodeVersion}' is too old to push notifications`);
|
|
41
39
|
}
|
|
@@ -120,7 +120,7 @@ async function execSQLiteQuery (db, query) {
|
|
|
120
120
|
async function execWix (args) {
|
|
121
121
|
try {
|
|
122
122
|
await fs.which(WIX_SIM_UTILS);
|
|
123
|
-
} catch
|
|
123
|
+
} catch {
|
|
124
124
|
throw new Error(
|
|
125
125
|
`${WIX_SIM_UTILS} binary has not been found in your PATH. ` +
|
|
126
126
|
`Please install it ('brew tap wix/brew && brew install wix/brew/applesimutils') to ` +
|
package/lib/extensions/safari.js
CHANGED
|
@@ -49,7 +49,7 @@ export async function openUrl (url) {
|
|
|
49
49
|
waitMs: SAFARI_STARTUP_TIMEOUT_MS,
|
|
50
50
|
intervalMs: 500,
|
|
51
51
|
});
|
|
52
|
-
} catch
|
|
52
|
+
} catch {
|
|
53
53
|
const secondsElapsed = timer.getDuration().asSeconds;
|
|
54
54
|
if (psError) {
|
|
55
55
|
this.log.warn(`Mobile Safari process existence cannot be verified after ${secondsElapsed.toFixed(3)}s. ` +
|
|
@@ -73,7 +73,7 @@ export async function openUrl (url) {
|
|
|
73
73
|
export async function scrubSafari (keepPrefs = true) {
|
|
74
74
|
try {
|
|
75
75
|
await this.terminateApp(MOBILE_SAFARI_BUNDLE_ID);
|
|
76
|
-
} catch
|
|
76
|
+
} catch {}
|
|
77
77
|
|
|
78
78
|
this.log.debug('Scrubbing Safari data files');
|
|
79
79
|
const safariData = await this.simctl.getAppContainer(MOBILE_SAFARI_BUNDLE_ID, 'data');
|
|
@@ -87,7 +87,7 @@ export async function updateSettings (domain, updates) {
|
|
|
87
87
|
* @since Xcode SDK 11.4
|
|
88
88
|
* @returns {Promise<void>}
|
|
89
89
|
*/
|
|
90
|
-
export async function setAppearance (value) {
|
|
90
|
+
export async function setAppearance (value) {
|
|
91
91
|
throw new Error(`Xcode SDK '${this.xcodeVersion}' is too old to set UI appearance`);
|
|
92
92
|
}
|
|
93
93
|
|
|
@@ -99,7 +99,7 @@ export async function setAppearance (value) { // eslint-disable-line require-awa
|
|
|
99
99
|
* @returns {Promise<string>}
|
|
100
100
|
* @since Xcode SDK 11.4
|
|
101
101
|
*/
|
|
102
|
-
export async function getAppearance () {
|
|
102
|
+
export async function getAppearance () {
|
|
103
103
|
throw new Error(`Xcode SDK '${this.xcodeVersion}' is too old to get UI appearance`);
|
|
104
104
|
}
|
|
105
105
|
|
|
@@ -9,7 +9,7 @@ import _ from 'lodash';
|
|
|
9
9
|
import path from 'path';
|
|
10
10
|
import B from 'bluebird';
|
|
11
11
|
import { getPath as getXcodePath } from 'appium-xcode';
|
|
12
|
-
import Simctl from 'node-simctl';
|
|
12
|
+
import { Simctl } from 'node-simctl';
|
|
13
13
|
import * as appExtensions from './extensions/applications';
|
|
14
14
|
import * as biometricExtensions from './extensions/biometric';
|
|
15
15
|
import * as safariExtensions from './extensions/safari';
|
|
@@ -238,7 +238,7 @@ export class SimulatorXcode10 extends EventEmitter {
|
|
|
238
238
|
try {
|
|
239
239
|
await this.simctl.getEnv('dummy');
|
|
240
240
|
return true;
|
|
241
|
-
} catch
|
|
241
|
+
} catch {
|
|
242
242
|
return false;
|
|
243
243
|
}
|
|
244
244
|
}
|
|
@@ -269,7 +269,7 @@ export class SimulatorXcode10 extends EventEmitter {
|
|
|
269
269
|
let stdout;
|
|
270
270
|
try {
|
|
271
271
|
({stdout} = await exec('pgrep', ['-fn', `${SIMULATOR_APP_NAME}/Contents/MacOS/`]));
|
|
272
|
-
} catch
|
|
272
|
+
} catch {
|
|
273
273
|
return null;
|
|
274
274
|
}
|
|
275
275
|
if (isNaN(parseInt(stdout, 10))) {
|
|
@@ -383,7 +383,7 @@ export class SimulatorXcode10 extends EventEmitter {
|
|
|
383
383
|
waitMs,
|
|
384
384
|
intervalMs: 100,
|
|
385
385
|
});
|
|
386
|
-
} catch
|
|
386
|
+
} catch {
|
|
387
387
|
throw new Error(`Simulator is not in 'Shutdown' state after ${waitMs}ms`);
|
|
388
388
|
}
|
|
389
389
|
}
|
|
@@ -458,7 +458,7 @@ export class SimulatorXcode10 extends EventEmitter {
|
|
|
458
458
|
waitMs: 5000,
|
|
459
459
|
intervalMs: 100,
|
|
460
460
|
});
|
|
461
|
-
} catch
|
|
461
|
+
} catch {
|
|
462
462
|
if (!await this.isRunning()) {
|
|
463
463
|
throw new Error(`Simulator with UDID '${this.udid}' cannot be transitioned to headless mode`);
|
|
464
464
|
}
|
|
@@ -40,7 +40,7 @@ export class SimulatorXcode15 extends SimulatorXcode14 {
|
|
|
40
40
|
'-c', 'print CFBundleIdentifier', infoPlistPath
|
|
41
41
|
]);
|
|
42
42
|
return _.trim(stdout);
|
|
43
|
-
} catch
|
|
43
|
+
} catch {
|
|
44
44
|
return null;
|
|
45
45
|
}
|
|
46
46
|
};
|
|
@@ -65,7 +65,7 @@ export class SimulatorXcode15 extends SimulatorXcode14 {
|
|
|
65
65
|
try {
|
|
66
66
|
const appContainer = await this.simctl.getAppContainer(bundleId);
|
|
67
67
|
return appContainer.endsWith('.app') && await fs.exists(appContainer);
|
|
68
|
-
} catch
|
|
68
|
+
} catch {
|
|
69
69
|
// get_app_container subcommand fails for system applications,
|
|
70
70
|
// as well as the hidden appinfo command
|
|
71
71
|
return (await this._fetchSystemAppBundleIds()).has(bundleId);
|
package/lib/simulator.js
CHANGED
|
@@ -3,27 +3,10 @@ import { SimulatorXcode11 } from './simulator-xcode-11';
|
|
|
3
3
|
import { SimulatorXcode11_4 } from './simulator-xcode-11.4';
|
|
4
4
|
import { SimulatorXcode14 } from './simulator-xcode-14';
|
|
5
5
|
import { SimulatorXcode15 } from './simulator-xcode-15';
|
|
6
|
-
import { getSimulatorInfo } from './utils';
|
|
7
|
-
import xcode from 'appium-xcode';
|
|
6
|
+
import { getSimulatorInfo, assertXcodeVersion, MIN_SUPPORTED_XCODE_VERSION } from './utils';
|
|
7
|
+
import * as xcode from 'appium-xcode';
|
|
8
8
|
import { log } from './logger';
|
|
9
9
|
|
|
10
|
-
const MIN_SUPPORTED_XCODE_VERSION = 10;
|
|
11
|
-
|
|
12
|
-
/**
|
|
13
|
-
* @template {import('appium-xcode').XcodeVersion} V
|
|
14
|
-
* @param {V} xcodeVersion
|
|
15
|
-
* @returns {V}
|
|
16
|
-
*/
|
|
17
|
-
function handleUnsupportedXcode (xcodeVersion) {
|
|
18
|
-
if (xcodeVersion.major < MIN_SUPPORTED_XCODE_VERSION) {
|
|
19
|
-
throw new Error(
|
|
20
|
-
`Tried to use an iOS simulator with xcode version ${xcodeVersion.versionString} but only Xcode version ` +
|
|
21
|
-
`${MIN_SUPPORTED_XCODE_VERSION} and up are supported`
|
|
22
|
-
);
|
|
23
|
-
}
|
|
24
|
-
return xcodeVersion;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
10
|
/**
|
|
28
11
|
* Finds and returns the corresponding Simulator instance for the given ID.
|
|
29
12
|
*
|
|
@@ -42,7 +25,7 @@ export async function getSimulator (udid, opts = {}) {
|
|
|
42
25
|
logger,
|
|
43
26
|
} = opts;
|
|
44
27
|
|
|
45
|
-
const xcodeVersion =
|
|
28
|
+
const xcodeVersion = assertXcodeVersion(
|
|
46
29
|
/** @type {import('appium-xcode').XcodeVersion} */ (await xcode.getVersion(true))
|
|
47
30
|
);
|
|
48
31
|
if (checkExistence) {
|
package/lib/utils.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import log from './logger';
|
|
1
|
+
import { log } from './logger';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import { exec } from 'teen_process';
|
|
4
4
|
import { waitForCondition } from 'asyncbox';
|
|
@@ -10,6 +10,7 @@ const DEFAULT_SIM_SHUTDOWN_TIMEOUT_MS = 30000;
|
|
|
10
10
|
export const SAFARI_STARTUP_TIMEOUT_MS = 25 * 1000;
|
|
11
11
|
export const MOBILE_SAFARI_BUNDLE_ID = 'com.apple.mobilesafari';
|
|
12
12
|
export const SIMULATOR_APP_NAME = 'Simulator.app';
|
|
13
|
+
export const MIN_SUPPORTED_XCODE_VERSION = 10;
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* @param {string} appName
|
|
@@ -53,7 +54,7 @@ export async function killAllSimulators (timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_
|
|
|
53
54
|
|
|
54
55
|
try {
|
|
55
56
|
await exec('xcrun', ['simctl', 'shutdown', xcodeVersion.major > 8 ? 'all' : 'booted'], {timeout});
|
|
56
|
-
} catch
|
|
57
|
+
} catch {}
|
|
57
58
|
|
|
58
59
|
const pids = [];
|
|
59
60
|
try {
|
|
@@ -74,13 +75,13 @@ export async function killAllSimulators (timeout = DEFAULT_SIM_SHUTDOWN_TIMEOUT_
|
|
|
74
75
|
log.debug(`Killing processes: ${pids.join(', ')}`);
|
|
75
76
|
try {
|
|
76
77
|
await exec('kill', ['-9', ...(pids.map((pid) => `${pid}`))]);
|
|
77
|
-
} catch
|
|
78
|
+
} catch {}
|
|
78
79
|
}
|
|
79
80
|
|
|
80
81
|
log.debug(`Using pkill to kill application: ${appName}`);
|
|
81
82
|
try {
|
|
82
83
|
await pkill(appName, true);
|
|
83
|
-
} catch
|
|
84
|
+
} catch {}
|
|
84
85
|
|
|
85
86
|
// wait for all the devices to be shutdown before Continuing
|
|
86
87
|
// but only print out the failed ones when they are actually fully failed
|
|
@@ -145,3 +146,18 @@ export async function getDeveloperRoot () {
|
|
|
145
146
|
const {stdout} = await exec('xcode-select', ['-p']);
|
|
146
147
|
return stdout.trim();
|
|
147
148
|
}
|
|
149
|
+
|
|
150
|
+
/**
|
|
151
|
+
* @template {import('appium-xcode').XcodeVersion} V
|
|
152
|
+
* @param {V} xcodeVersion
|
|
153
|
+
* @returns {V}
|
|
154
|
+
*/
|
|
155
|
+
export function assertXcodeVersion (xcodeVersion) {
|
|
156
|
+
if (xcodeVersion.major < MIN_SUPPORTED_XCODE_VERSION) {
|
|
157
|
+
throw new Error(
|
|
158
|
+
`Tried to use an iOS simulator with xcode version ${xcodeVersion.versionString} but only Xcode version ` +
|
|
159
|
+
`${MIN_SUPPORTED_XCODE_VERSION} and up are supported`
|
|
160
|
+
);
|
|
161
|
+
}
|
|
162
|
+
return xcodeVersion;
|
|
163
|
+
}
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"ios",
|
|
8
8
|
"simctl"
|
|
9
9
|
],
|
|
10
|
-
"version": "6.1.
|
|
10
|
+
"version": "6.1.17",
|
|
11
11
|
"author": "Appium Contributors",
|
|
12
12
|
"license": "Apache-2.0",
|
|
13
13
|
"repository": {
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"singleQuote": true
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@appium/eslint-config-appium-ts": "^
|
|
66
|
+
"@appium/eslint-config-appium-ts": "^1.x",
|
|
67
67
|
"@appium/tsconfig": "^0.x",
|
|
68
68
|
"@appium/types": "^0.x",
|
|
69
69
|
"@colors/colors": "^1.5.0",
|