appium-xcuitest-driver 11.6.1 → 11.7.0
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/app-infos-cache.js +4 -4
- package/build/lib/app-infos-cache.js.map +1 -1
- package/build/lib/commands/app-install.js +22 -36
- package/build/lib/commands/app-install.js.map +1 -1
- package/build/lib/commands/app-management.d.ts.map +1 -1
- package/build/lib/commands/app-management.js +6 -8
- package/build/lib/commands/app-management.js.map +1 -1
- package/build/lib/commands/app-strings.d.ts.map +1 -1
- package/build/lib/commands/app-strings.js +11 -11
- package/build/lib/commands/app-strings.js.map +1 -1
- package/build/lib/commands/appearance.d.ts.map +1 -1
- package/build/lib/commands/appearance.js +2 -6
- package/build/lib/commands/appearance.js.map +1 -1
- package/build/lib/commands/battery.js +2 -2
- package/build/lib/commands/battery.js.map +1 -1
- package/build/lib/commands/bidi/models.d.ts.map +1 -1
- package/build/lib/commands/bidi/models.js +1 -5
- package/build/lib/commands/bidi/models.js.map +1 -1
- package/build/lib/commands/biometric.js +4 -4
- package/build/lib/commands/biometric.js.map +1 -1
- package/build/lib/commands/certificate.d.ts.map +1 -1
- package/build/lib/commands/certificate.js +7 -8
- package/build/lib/commands/certificate.js.map +1 -1
- package/build/lib/commands/condition.js +4 -4
- package/build/lib/commands/condition.js.map +1 -1
- package/build/lib/commands/content-size.d.ts.map +1 -1
- package/build/lib/commands/content-size.js +4 -8
- package/build/lib/commands/content-size.js.map +1 -1
- package/build/lib/commands/context.js +24 -27
- package/build/lib/commands/context.js.map +1 -1
- package/build/lib/commands/element.d.ts.map +1 -1
- package/build/lib/commands/element.js +7 -11
- package/build/lib/commands/element.js.map +1 -1
- package/build/lib/commands/execute.d.ts.map +1 -1
- package/build/lib/commands/execute.js +3 -7
- package/build/lib/commands/execute.js.map +1 -1
- package/build/lib/commands/file-movement.d.ts.map +1 -1
- package/build/lib/commands/file-movement.js +6 -7
- package/build/lib/commands/file-movement.js.map +1 -1
- package/build/lib/commands/find.js +3 -6
- package/build/lib/commands/find.js.map +1 -1
- package/build/lib/commands/general.d.ts.map +1 -1
- package/build/lib/commands/general.js +1 -2
- package/build/lib/commands/general.js.map +1 -1
- package/build/lib/commands/gesture.js +12 -15
- package/build/lib/commands/gesture.js.map +1 -1
- package/build/lib/{utils → commands/helpers}/app.d.ts +5 -6
- package/build/lib/commands/helpers/app.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/app.js +10 -12
- package/build/lib/commands/helpers/app.js.map +1 -0
- package/build/lib/commands/helpers/async.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/async.js +6 -10
- package/build/lib/commands/helpers/async.js.map +1 -0
- package/build/lib/commands/helpers/guards.d.ts +18 -0
- package/build/lib/commands/helpers/guards.d.ts.map +1 -0
- package/build/lib/commands/{guards.js → helpers/guards.js} +3 -6
- package/build/lib/commands/helpers/guards.js.map +1 -0
- package/build/lib/commands/helpers/index.d.ts +17 -0
- package/build/lib/commands/helpers/index.d.ts.map +1 -0
- package/build/lib/commands/helpers/index.js +46 -0
- package/build/lib/commands/helpers/index.js.map +1 -0
- package/build/lib/commands/helpers/network.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/network.js +4 -7
- package/build/lib/commands/helpers/network.js.map +1 -0
- package/build/lib/{utils → commands/helpers}/platform.d.ts +0 -3
- package/build/lib/commands/helpers/platform.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/platform.js +3 -10
- package/build/lib/commands/helpers/platform.js.map +1 -0
- package/build/lib/{utils → commands/helpers}/runtime.d.ts +3 -2
- package/build/lib/commands/helpers/runtime.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/runtime.js +6 -6
- package/build/lib/commands/helpers/runtime.js.map +1 -0
- package/build/lib/commands/helpers/session.d.ts +20 -0
- package/build/lib/commands/helpers/session.d.ts.map +1 -0
- package/build/lib/commands/{session.js → helpers/session.js} +3 -7
- package/build/lib/commands/helpers/session.js.map +1 -0
- package/build/lib/commands/helpers/validation.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/validation.js +8 -11
- package/build/lib/commands/helpers/validation.js.map +1 -0
- package/build/lib/commands/helpers/xcode.d.ts.map +1 -0
- package/build/lib/{utils → commands/helpers}/xcode.js +1 -1
- package/build/lib/commands/helpers/xcode.js.map +1 -0
- package/build/lib/commands/increase-contrast.d.ts.map +1 -1
- package/build/lib/commands/increase-contrast.js +4 -8
- package/build/lib/commands/increase-contrast.js.map +1 -1
- package/build/lib/commands/keyboard.d.ts.map +1 -1
- package/build/lib/commands/keyboard.js +4 -5
- package/build/lib/commands/keyboard.js.map +1 -1
- package/build/lib/commands/keychains.js +2 -2
- package/build/lib/commands/keychains.js.map +1 -1
- package/build/lib/commands/localization.js +2 -2
- package/build/lib/commands/localization.js.map +1 -1
- package/build/lib/commands/location.js +4 -4
- package/build/lib/commands/location.js.map +1 -1
- package/build/lib/commands/log.js +19 -19
- package/build/lib/commands/log.js.map +1 -1
- package/build/lib/commands/memory.js +6 -9
- package/build/lib/commands/memory.js.map +1 -1
- package/build/lib/commands/navigation.js +2 -2
- package/build/lib/commands/navigation.js.map +1 -1
- package/build/lib/commands/network-monitor.d.ts.map +1 -1
- package/build/lib/commands/network-monitor.js +3 -4
- package/build/lib/commands/network-monitor.js.map +1 -1
- package/build/lib/commands/notifications.js +5 -8
- package/build/lib/commands/notifications.js.map +1 -1
- package/build/lib/commands/pasteboard.d.ts.map +1 -1
- package/build/lib/commands/pasteboard.js +4 -8
- package/build/lib/commands/pasteboard.js.map +1 -1
- package/build/lib/commands/performance.d.ts +1 -1
- package/build/lib/commands/performance.d.ts.map +1 -1
- package/build/lib/commands/performance.js +16 -10
- package/build/lib/commands/performance.js.map +1 -1
- package/build/lib/commands/permissions.js +9 -12
- package/build/lib/commands/permissions.js.map +1 -1
- package/build/lib/commands/proxy-helper.js +3 -3
- package/build/lib/commands/proxy-helper.js.map +1 -1
- package/build/lib/commands/record-audio.js +2 -2
- package/build/lib/commands/record-audio.js.map +1 -1
- package/build/lib/commands/recordscreen.d.ts.map +1 -1
- package/build/lib/commands/recordscreen.js +5 -9
- package/build/lib/commands/recordscreen.js.map +1 -1
- package/build/lib/commands/screenshots.js +5 -8
- package/build/lib/commands/screenshots.js.map +1 -1
- package/build/lib/commands/simctl.js +2 -2
- package/build/lib/commands/simctl.js.map +1 -1
- package/build/lib/commands/source.d.ts.map +1 -1
- package/build/lib/commands/source.js +2 -2
- package/build/lib/commands/source.js.map +1 -1
- package/build/lib/commands/wda/cleanup.js +3 -3
- package/build/lib/commands/wda/cleanup.js.map +1 -1
- package/build/lib/commands/wda/startup.js +11 -11
- package/build/lib/commands/wda/startup.js.map +1 -1
- package/build/lib/commands/web.d.ts.map +1 -1
- package/build/lib/commands/web.js +39 -41
- package/build/lib/commands/web.js.map +1 -1
- package/build/lib/commands/xctest-record-screen.js +5 -5
- package/build/lib/commands/xctest-record-screen.js.map +1 -1
- package/build/lib/commands/xctest.d.ts.map +1 -1
- package/build/lib/commands/xctest.js +1 -5
- package/build/lib/commands/xctest.js.map +1 -1
- package/build/lib/constants.d.ts +4 -0
- package/build/lib/constants.d.ts.map +1 -0
- package/build/lib/constants.js +7 -0
- package/build/lib/constants.js.map +1 -0
- package/build/lib/css-converter.js +10 -13
- package/build/lib/css-converter.js.map +1 -1
- package/build/lib/desired-caps.js +2 -2
- package/build/lib/desired-caps.js.map +1 -1
- package/build/lib/device/afc-client.js +2 -2
- package/build/lib/device/afc-client.js.map +1 -1
- package/build/lib/device/app-termination-client.js +5 -8
- package/build/lib/device/app-termination-client.js.map +1 -1
- package/build/lib/device/condition-inducer-client.js +2 -2
- package/build/lib/device/condition-inducer-client.js.map +1 -1
- package/build/lib/device/connected-devices-client.d.ts.map +1 -1
- package/build/lib/device/connected-devices-client.js +3 -7
- package/build/lib/device/connected-devices-client.js.map +1 -1
- package/build/lib/device/device-connections-factory.js +10 -10
- package/build/lib/device/device-connections-factory.js.map +1 -1
- package/build/lib/device/lockdown-client.js +2 -2
- package/build/lib/device/lockdown-client.js.map +1 -1
- package/build/lib/device/log/helpers.d.ts.map +1 -1
- package/build/lib/device/log/helpers.js +1 -5
- package/build/lib/device/log/helpers.js.map +1 -1
- package/build/lib/device/log/ios-crash-log.d.ts.map +1 -1
- package/build/lib/device/log/ios-crash-log.js +4 -3
- package/build/lib/device/log/ios-crash-log.js.map +1 -1
- package/build/lib/device/log/ios-performance-log.js +2 -5
- package/build/lib/device/log/ios-performance-log.js.map +1 -1
- package/build/lib/device/log/ios-simulator-log.js +3 -3
- package/build/lib/device/log/ios-simulator-log.js.map +1 -1
- package/build/lib/device/log/safari-console-log.js +2 -5
- package/build/lib/device/log/safari-console-log.js.map +1 -1
- package/build/lib/device/log/safari-network-log.js +4 -7
- package/build/lib/device/log/safari-network-log.js.map +1 -1
- package/build/lib/device/real-device-management.d.ts.map +1 -1
- package/build/lib/device/real-device-management.js +28 -25
- package/build/lib/device/real-device-management.js.map +1 -1
- package/build/lib/device/simulator-management.d.ts.map +1 -1
- package/build/lib/device/simulator-management.js +15 -16
- package/build/lib/device/simulator-management.js.map +1 -1
- package/build/lib/device/xctest-attachment-deletion-client.js +3 -3
- package/build/lib/device/xctest-attachment-deletion-client.js.map +1 -1
- package/build/lib/device/xctest-client.js +2 -2
- package/build/lib/device/xctest-client.js.map +1 -1
- package/build/lib/doctor/optional-checks.js +3 -3
- package/build/lib/doctor/optional-checks.js.map +1 -1
- package/build/lib/driver.d.ts +5 -4
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +55 -54
- package/build/lib/driver.js.map +1 -1
- package/build/lib/utils/index.d.ts +2 -11
- package/build/lib/utils/index.d.ts.map +1 -1
- package/build/lib/utils/index.js +12 -35
- package/build/lib/utils/index.js.map +1 -1
- package/build/lib/utils/lang.d.ts +43 -0
- package/build/lib/utils/lang.d.ts.map +1 -0
- package/build/lib/utils/lang.js +104 -0
- package/build/lib/utils/lang.js.map +1 -0
- package/build/lib/utils/memoize.d.ts +11 -0
- package/build/lib/utils/memoize.d.ts.map +1 -0
- package/build/lib/utils/memoize.js +26 -0
- package/build/lib/utils/memoize.js.map +1 -0
- package/lib/app-infos-cache.ts +4 -4
- package/lib/commands/app-install.ts +16 -33
- package/lib/commands/app-management.ts +3 -5
- package/lib/commands/app-strings.ts +14 -12
- package/lib/commands/appearance.ts +4 -3
- package/lib/commands/battery.ts +1 -1
- package/lib/commands/bidi/models.ts +1 -2
- package/lib/commands/biometric.ts +1 -1
- package/lib/commands/certificate.ts +3 -4
- package/lib/commands/condition.ts +1 -1
- package/lib/commands/content-size.ts +2 -3
- package/lib/commands/context.ts +24 -24
- package/lib/commands/element.ts +9 -8
- package/lib/commands/execute.ts +3 -4
- package/lib/commands/file-movement.ts +8 -8
- package/lib/commands/find.ts +3 -3
- package/lib/commands/general.ts +1 -2
- package/lib/commands/gesture.ts +11 -11
- package/lib/{utils → commands/helpers}/app.ts +15 -15
- package/lib/{utils → commands/helpers}/async.ts +7 -10
- package/lib/commands/helpers/guards.ts +31 -0
- package/lib/commands/helpers/index.ts +38 -0
- package/lib/{utils → commands/helpers}/network.ts +4 -4
- package/lib/{utils → commands/helpers}/platform.ts +2 -6
- package/lib/{utils → commands/helpers}/runtime.ts +6 -8
- package/lib/commands/helpers/session.ts +38 -0
- package/lib/{utils → commands/helpers}/validation.ts +8 -8
- package/lib/{utils → commands/helpers}/xcode.ts +1 -1
- package/lib/commands/increase-contrast.ts +6 -3
- package/lib/commands/keyboard.ts +4 -2
- package/lib/commands/keychains.ts +1 -1
- package/lib/commands/localization.ts +1 -1
- package/lib/commands/location.ts +1 -1
- package/lib/commands/log.ts +17 -17
- package/lib/commands/memory.ts +5 -5
- package/lib/commands/navigation.ts +1 -1
- package/lib/commands/network-monitor.ts +1 -2
- package/lib/commands/notifications.ts +4 -4
- package/lib/commands/pasteboard.ts +2 -3
- package/lib/commands/performance.ts +16 -10
- package/lib/commands/permissions.ts +7 -7
- package/lib/commands/proxy-helper.ts +1 -1
- package/lib/commands/record-audio.ts +1 -1
- package/lib/commands/recordscreen.ts +4 -5
- package/lib/commands/screenshots.ts +5 -5
- package/lib/commands/simctl.ts +1 -1
- package/lib/commands/source.ts +3 -2
- package/lib/commands/wda/cleanup.ts +3 -3
- package/lib/commands/wda/startup.ts +9 -9
- package/lib/commands/web.ts +42 -37
- package/lib/commands/xctest-record-screen.ts +5 -5
- package/lib/commands/xctest.ts +1 -2
- package/lib/constants.ts +3 -0
- package/lib/css-converter.ts +12 -12
- package/lib/desired-caps.ts +1 -1
- package/lib/device/afc-client.ts +1 -1
- package/lib/device/app-termination-client.ts +3 -3
- package/lib/device/condition-inducer-client.ts +1 -1
- package/lib/device/connected-devices-client.ts +2 -3
- package/lib/device/device-connections-factory.ts +9 -9
- package/lib/device/lockdown-client.ts +1 -1
- package/lib/device/log/helpers.ts +1 -2
- package/lib/device/log/ios-crash-log.ts +4 -3
- package/lib/device/log/ios-performance-log.ts +2 -2
- package/lib/device/log/ios-simulator-log.ts +3 -3
- package/lib/device/log/safari-console-log.ts +2 -2
- package/lib/device/log/safari-network-log.ts +4 -4
- package/lib/device/real-device-management.ts +23 -22
- package/lib/device/simulator-management.ts +15 -11
- package/lib/device/xctest-attachment-deletion-client.ts +1 -1
- package/lib/device/xctest-client.ts +1 -1
- package/lib/doctor/optional-checks.ts +1 -1
- package/lib/driver.ts +51 -44
- package/lib/utils/index.ts +10 -31
- package/lib/utils/lang.ts +109 -0
- package/lib/utils/memoize.ts +26 -0
- package/npm-shrinkwrap.json +3 -5
- package/package.json +2 -4
- package/scripts/tunnel-creation.mjs +9 -10
- package/build/lib/commands/guards.d.ts +0 -14
- package/build/lib/commands/guards.d.ts.map +0 -1
- package/build/lib/commands/guards.js.map +0 -1
- package/build/lib/commands/session.d.ts +0 -9
- package/build/lib/commands/session.d.ts.map +0 -1
- package/build/lib/commands/session.js.map +0 -1
- package/build/lib/commands/wda/index.d.ts +0 -5
- package/build/lib/commands/wda/index.d.ts.map +0 -1
- package/build/lib/commands/wda/index.js +0 -28
- package/build/lib/commands/wda/index.js.map +0 -1
- package/build/lib/utils/app.d.ts.map +0 -1
- package/build/lib/utils/app.js.map +0 -1
- package/build/lib/utils/async.d.ts.map +0 -1
- package/build/lib/utils/async.js.map +0 -1
- package/build/lib/utils/network.d.ts.map +0 -1
- package/build/lib/utils/network.js.map +0 -1
- package/build/lib/utils/platform.d.ts.map +0 -1
- package/build/lib/utils/platform.js.map +0 -1
- package/build/lib/utils/runtime.d.ts.map +0 -1
- package/build/lib/utils/runtime.js.map +0 -1
- package/build/lib/utils/validation.d.ts.map +0 -1
- package/build/lib/utils/validation.js.map +0 -1
- package/build/lib/utils/xcode.d.ts.map +0 -1
- package/build/lib/utils/xcode.js.map +0 -1
- package/lib/commands/guards.ts +0 -26
- package/lib/commands/session.ts +0 -25
- package/lib/commands/wda/index.ts +0 -9
- /package/build/lib/{utils → commands/helpers}/async.d.ts +0 -0
- /package/build/lib/{utils → commands/helpers}/network.d.ts +0 -0
- /package/build/lib/{utils → commands/helpers}/validation.d.ts +0 -0
- /package/build/lib/{utils → commands/helpers}/xcode.d.ts +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [11.7.0](https://github.com/appium/appium-xcuitest-driver/compare/v11.6.1...v11.7.0) (2026-05-23)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Ditch lodash ([#2846](https://github.com/appium/appium-xcuitest-driver/issues/2846)) ([daa3eb0](https://github.com/appium/appium-xcuitest-driver/commit/daa3eb0936a6552c0163c6e16065ed400e3a021f))
|
|
6
|
+
|
|
1
7
|
## [11.6.1](https://github.com/appium/appium-xcuitest-driver/compare/v11.6.0...v11.6.1) (2026-05-22)
|
|
2
8
|
|
|
3
9
|
### Bug Fixes
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.AppInfosCache = void 0;
|
|
7
|
-
const
|
|
7
|
+
const utils_1 = require("./utils");
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
9
|
const support_1 = require("appium/support");
|
|
10
10
|
const lru_cache_1 = require("lru-cache");
|
|
@@ -13,7 +13,7 @@ const MANIFEST_CACHE = new lru_cache_1.LRUCache({
|
|
|
13
13
|
updateAgeOnHas: true,
|
|
14
14
|
});
|
|
15
15
|
const MANIFEST_FILE_NAME = 'Info.plist';
|
|
16
|
-
const IPA_ROOT_PLIST_PATH_PATTERN = new RegExp(`^Payload/[^/]+\\.app/${
|
|
16
|
+
const IPA_ROOT_PLIST_PATH_PATTERN = new RegExp(`^Payload/[^/]+\\.app/${(0, utils_1.escapeRegExp)(MANIFEST_FILE_NAME)}$`);
|
|
17
17
|
const MAX_MANIFEST_SIZE = 1024 * 1024; // 1 MiB
|
|
18
18
|
class AppInfosCache {
|
|
19
19
|
log;
|
|
@@ -106,7 +106,7 @@ class AppInfosCache {
|
|
|
106
106
|
await extractEntryTo(tmpRoot);
|
|
107
107
|
const plistPath = node_path_1.default.resolve(tmpRoot, entry.fileName);
|
|
108
108
|
manifestPayload = await this._readPlist(plistPath, ipaPath);
|
|
109
|
-
if (
|
|
109
|
+
if ((0, utils_1.isPlainObject)(manifestPayload) && entry.uncompressedSize <= MAX_MANIFEST_SIZE) {
|
|
110
110
|
this.log.debug(`Caching the manifest '${entry.fileName}' for ${manifestPayload?.CFBundleIdentifier} app ` +
|
|
111
111
|
`from the compressed source using the key '${hash}'`);
|
|
112
112
|
MANIFEST_CACHE.set(hash, manifestPayload);
|
|
@@ -150,7 +150,7 @@ class AppInfosCache {
|
|
|
150
150
|
this._readPlist(manifestPath, appPath),
|
|
151
151
|
support_1.fs.stat(manifestPath),
|
|
152
152
|
]);
|
|
153
|
-
if (stat.size <= MAX_MANIFEST_SIZE &&
|
|
153
|
+
if (stat.size <= MAX_MANIFEST_SIZE && (0, utils_1.isPlainObject)(payload)) {
|
|
154
154
|
this.log.debug(`Caching the manifest for ${payload.CFBundleIdentifier} app from a file source using the key '${hash}'`);
|
|
155
155
|
MANIFEST_CACHE.set(hash, payload);
|
|
156
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-infos-cache.js","sourceRoot":"","sources":["../../lib/app-infos-cache.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"app-infos-cache.js","sourceRoot":"","sources":["../../lib/app-infos-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.verifyApplicationPlatform = verifyApplicationPlatform;
|
|
7
7
|
exports.onDownloadApp = onDownloadApp;
|
|
8
8
|
exports.onPostConfigureApp = onPostConfigureApp;
|
|
9
|
-
const
|
|
9
|
+
const utils_1 = require("../utils");
|
|
10
10
|
const node_path_1 = __importDefault(require("node:path"));
|
|
11
11
|
const node_os_1 = __importDefault(require("node:os"));
|
|
12
12
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
13
13
|
const support_1 = require("appium/support");
|
|
14
14
|
const teen_process_1 = require("teen_process");
|
|
15
|
-
const
|
|
15
|
+
const helpers_1 = require("./helpers");
|
|
16
16
|
const constants_1 = require("./constants");
|
|
17
17
|
const ZIP_EXT = '.zip';
|
|
18
18
|
const SANITIZE_REPLACEMENT = '-';
|
|
@@ -30,7 +30,7 @@ async function verifyApplicationPlatform() {
|
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
const supportedPlatforms = await this.appInfosCache.extractAppPlatforms(this.opts.app);
|
|
33
|
-
const isTvOS = (0,
|
|
33
|
+
const isTvOS = (0, helpers_1.isTvOs)(this.opts.platformName);
|
|
34
34
|
const prefix = isTvOS ? 'AppleTV' : 'iPhone';
|
|
35
35
|
const suffix = this.isSimulator() ? 'Simulator' : 'OS';
|
|
36
36
|
const dstPlatform = `${prefix}${suffix}`;
|
|
@@ -46,9 +46,9 @@ async function verifyApplicationPlatform() {
|
|
|
46
46
|
(0, teen_process_1.exec)('lipo', ['-info', executablePath]),
|
|
47
47
|
(0, teen_process_1.exec)('uname', ['-m']),
|
|
48
48
|
]);
|
|
49
|
-
const bundleExecutableInfo =
|
|
49
|
+
const bundleExecutableInfo = resFile.stdout.trim();
|
|
50
50
|
this.log.debug(bundleExecutableInfo);
|
|
51
|
-
const processArch =
|
|
51
|
+
const processArch = resUname.stdout.trim();
|
|
52
52
|
this.log.debug(`Current process architecture: ${processArch}`);
|
|
53
53
|
const isAppleSiliconCpu = isAppleSilicon();
|
|
54
54
|
this.log.debug(`Is Apple Silicon CPU: ${isAppleSiliconCpu}`);
|
|
@@ -58,11 +58,11 @@ async function verifyApplicationPlatform() {
|
|
|
58
58
|
`Consider using binaries compiled natively for the ARM64 architecture to run Appium server ` +
|
|
59
59
|
`with this driver.`);
|
|
60
60
|
}
|
|
61
|
-
if (
|
|
61
|
+
if (bundleExecutableInfo.includes(processArch)) {
|
|
62
62
|
return;
|
|
63
63
|
}
|
|
64
64
|
const hasRosetta = isAppleSiliconCpu && (await isRosettaInstalled());
|
|
65
|
-
const isIntelApp =
|
|
65
|
+
const isIntelApp = bundleExecutableInfo.includes(INTEL_ARCH);
|
|
66
66
|
// We cannot run Simulator builds compiled for arm64 on Intel machines
|
|
67
67
|
// Rosetta allows only to run Intel ones on arm64
|
|
68
68
|
if ((isIntelApp && (!isAppleSiliconCpu || hasRosetta)) || (!isIntelApp && isAppleSiliconCpu)) {
|
|
@@ -89,7 +89,7 @@ async function onDownloadApp(opts) {
|
|
|
89
89
|
/** Post-processes configured apps and reuses a valid cache entry when possible. */
|
|
90
90
|
async function onPostConfigureApp(opts) {
|
|
91
91
|
// Pick the previously cached entry if its integrity has been preserved
|
|
92
|
-
const appInfo =
|
|
92
|
+
const appInfo = (0, utils_1.isPlainObject)(opts.cachedAppInfo)
|
|
93
93
|
? opts.cachedAppInfo
|
|
94
94
|
: undefined;
|
|
95
95
|
const cachedPath = appInfo ? appInfo.fullPath : undefined;
|
|
@@ -150,7 +150,7 @@ async function onPostConfigureApp(opts) {
|
|
|
150
150
|
* @returns Whether the given path points to an .app bundle
|
|
151
151
|
*/
|
|
152
152
|
async function isAppBundle(appPath) {
|
|
153
|
-
return (
|
|
153
|
+
return (appPath.toLowerCase().endsWith(constants_1.APP_EXT) &&
|
|
154
154
|
(await support_1.fs.stat(appPath)).isDirectory() &&
|
|
155
155
|
(await support_1.fs.exists(node_path_1.default.join(appPath, 'Info.plist'))));
|
|
156
156
|
}
|
|
@@ -161,14 +161,14 @@ async function isAppBundle(appPath) {
|
|
|
161
161
|
* @returns Whether the given path points to an .ipa bundle
|
|
162
162
|
*/
|
|
163
163
|
async function isIpaBundle(appPath) {
|
|
164
|
-
return
|
|
164
|
+
return appPath.toLowerCase().endsWith(constants_1.IPA_EXT) && (await support_1.fs.stat(appPath)).isFile();
|
|
165
165
|
}
|
|
166
166
|
/**
|
|
167
167
|
* Used to parse the file name value from response headers
|
|
168
168
|
*/
|
|
169
169
|
function parseFileName(headers) {
|
|
170
170
|
const contentDisposition = headers['content-disposition'];
|
|
171
|
-
if (
|
|
171
|
+
if (typeof contentDisposition !== 'string') {
|
|
172
172
|
return null;
|
|
173
173
|
}
|
|
174
174
|
if (/^attachment/i.test(contentDisposition)) {
|
|
@@ -196,11 +196,11 @@ async function downloadIpa(stream, headers) {
|
|
|
196
196
|
// Check if the file to be downloaded is a .zip rather than .ipa
|
|
197
197
|
const fileName = parseFileName(headers) ?? `appium-app-${new Date().getTime()}${constants_1.IPA_EXT}`;
|
|
198
198
|
if (fileName.toLowerCase().endsWith(ZIP_EXT)) {
|
|
199
|
-
const { rootDir, archiveSize } = await (0,
|
|
199
|
+
const { rootDir, archiveSize } = await (0, helpers_1.unzipStream)(stream);
|
|
200
200
|
logPerformance(rootDir, archiveSize, 'downloaded and unzipped');
|
|
201
201
|
try {
|
|
202
|
-
const matchedPaths = await findApps(rootDir, [constants_1.IPA_EXT]);
|
|
203
|
-
if (!
|
|
202
|
+
const matchedPaths = await (0, helpers_1.findApps)(rootDir, [constants_1.IPA_EXT]);
|
|
203
|
+
if (!(0, utils_1.isEmpty)(matchedPaths)) {
|
|
204
204
|
this.log.debug(`Found ${support_1.util.pluralize(`${constants_1.IPA_EXT} application`, matchedPaths.length, true)} in ` +
|
|
205
205
|
`'${node_path_1.default.basename(rootDir)}': ${matchedPaths}`);
|
|
206
206
|
}
|
|
@@ -253,20 +253,6 @@ async function downloadIpa(stream, headers) {
|
|
|
253
253
|
}
|
|
254
254
|
return ipaPath;
|
|
255
255
|
}
|
|
256
|
-
/**
|
|
257
|
-
* Looks for items with given extensions in the given folder
|
|
258
|
-
*
|
|
259
|
-
* @param appPath Full path to an app bundle
|
|
260
|
-
* @param appExtensions List of matching item extensions
|
|
261
|
-
* @returns List of relative paths to matched items
|
|
262
|
-
*/
|
|
263
|
-
async function findApps(appPath, appExtensions) {
|
|
264
|
-
const globPattern = `**/*.+(${appExtensions.map((ext) => ext.replace(/^\./, '')).join('|')})`;
|
|
265
|
-
const sortedBundleItems = (await support_1.fs.glob(globPattern, {
|
|
266
|
-
cwd: appPath,
|
|
267
|
-
})).sort((a, b) => a.split(node_path_1.default.sep).length - b.split(node_path_1.default.sep).length);
|
|
268
|
-
return sortedBundleItems;
|
|
269
|
-
}
|
|
270
256
|
/**
|
|
271
257
|
* Moves the application bundle to a newly created temporary folder
|
|
272
258
|
*
|
|
@@ -309,14 +295,14 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
|
|
|
309
295
|
let rootDir;
|
|
310
296
|
let archiveSize;
|
|
311
297
|
try {
|
|
312
|
-
if (
|
|
313
|
-
({ rootDir, archiveSize } = await (0,
|
|
298
|
+
if (typeof appPathOrZipStream === 'string') {
|
|
299
|
+
({ rootDir, archiveSize } = await (0, helpers_1.unzipFile)(appPathOrZipStream));
|
|
314
300
|
}
|
|
315
301
|
else {
|
|
316
302
|
if (depth > 0) {
|
|
317
303
|
node_assert_1.default.fail('Streaming unzip cannot be invoked for nested archive items');
|
|
318
304
|
}
|
|
319
|
-
({ rootDir, archiveSize } = await (0,
|
|
305
|
+
({ rootDir, archiveSize } = await (0, helpers_1.unzipStream)(appPathOrZipStream));
|
|
320
306
|
}
|
|
321
307
|
}
|
|
322
308
|
catch (e) {
|
|
@@ -327,7 +313,7 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
|
|
|
327
313
|
}
|
|
328
314
|
const secondsElapsed = timer.getDuration().asSeconds;
|
|
329
315
|
this.log.info(`The file (${support_1.util.toReadableSizeString(archiveSize)}) ` +
|
|
330
|
-
`has been ${
|
|
316
|
+
`has been ${typeof appPathOrZipStream === 'string' ? 'extracted' : 'downloaded and extracted'} ` +
|
|
331
317
|
`to '${rootDir}' in ${secondsElapsed.toFixed(3)}s`);
|
|
332
318
|
// it does not make much sense to approximate the speed for short downloads
|
|
333
319
|
if (secondsElapsed >= 1) {
|
|
@@ -343,20 +329,20 @@ async function unzipApp(appPathOrZipStream, depth = 0) {
|
|
|
343
329
|
this.log.info(e.message);
|
|
344
330
|
return false;
|
|
345
331
|
}
|
|
346
|
-
if (this.isSimulator() && !platforms.some((p) =>
|
|
332
|
+
if (this.isSimulator() && !platforms.some((p) => p.includes('Simulator'))) {
|
|
347
333
|
this.log.info(`'${appPath}' does not have Simulator devices in the list of supported platforms ` +
|
|
348
334
|
`(${platforms.join(',')}). Skipping it`);
|
|
349
335
|
return false;
|
|
350
336
|
}
|
|
351
|
-
if (this.isRealDevice() && !platforms.some((p) =>
|
|
337
|
+
if (this.isRealDevice() && !platforms.some((p) => p.includes('OS'))) {
|
|
352
338
|
this.log.info(`'${appPath}' does not have real devices in the list of supported platforms ` +
|
|
353
339
|
`(${platforms.join(',')}). Skipping it`);
|
|
354
340
|
return false;
|
|
355
341
|
}
|
|
356
342
|
return true;
|
|
357
343
|
};
|
|
358
|
-
const matchedPaths = await findApps(rootDir, constants_1.SUPPORTED_EXTENSIONS);
|
|
359
|
-
if (
|
|
344
|
+
const matchedPaths = await (0, helpers_1.findApps)(rootDir, constants_1.SUPPORTED_EXTENSIONS);
|
|
345
|
+
if ((0, utils_1.isEmpty)(matchedPaths)) {
|
|
360
346
|
this.log.debug(`'${node_path_1.default.basename(rootDir)}' has no bundles`);
|
|
361
347
|
}
|
|
362
348
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-install.js","sourceRoot":"","sources":["../../../lib/commands/app-install.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app-install.js","sourceRoot":"","sources":["../../../lib/commands/app-install.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,14 +19,12 @@ exports.queryAppState = queryAppState;
|
|
|
19
19
|
exports.mobileListApps = mobileListApps;
|
|
20
20
|
exports.mobileClearApp = mobileClearApp;
|
|
21
21
|
exports.background = background;
|
|
22
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
23
22
|
const support_1 = require("appium/support");
|
|
24
23
|
const driver_1 = require("appium/driver");
|
|
25
24
|
const node_path_1 = __importDefault(require("node:path"));
|
|
26
|
-
const
|
|
25
|
+
const helpers_1 = require("./helpers");
|
|
27
26
|
const constants_1 = require("./constants");
|
|
28
27
|
const app_install_1 = require("./app-install");
|
|
29
|
-
const guards_1 = require("./guards");
|
|
30
28
|
const installation_proxy_client_1 = require("../device/installation-proxy-client");
|
|
31
29
|
/**
|
|
32
30
|
* Installs the given application to the device under test.
|
|
@@ -149,7 +147,7 @@ async function mobileActivateApp(bundleId) {
|
|
|
149
147
|
* @group Real Device Only
|
|
150
148
|
*/
|
|
151
149
|
async function mobileKillApp(bundleId) {
|
|
152
|
-
return await (0,
|
|
150
|
+
return await (0, helpers_1.requireRealDevice)(this, 'Killing app').terminateApp(bundleId);
|
|
153
151
|
}
|
|
154
152
|
/**
|
|
155
153
|
* Queries the state of an installed application from the device under test.
|
|
@@ -242,8 +240,8 @@ async function queryAppState(bundleId) {
|
|
|
242
240
|
* @group Real Device Only
|
|
243
241
|
*/
|
|
244
242
|
async function mobileListApps(applicationType = 'User', returnAttributes) {
|
|
245
|
-
const device = (0,
|
|
246
|
-
const useRemoteXPC = (0,
|
|
243
|
+
const device = (0, helpers_1.requireRealDevice)(this, 'Listing apps');
|
|
244
|
+
const useRemoteXPC = (0, helpers_1.isIos18OrNewer)(this.opts);
|
|
247
245
|
const client = await installation_proxy_client_1.InstallationProxyClient.create(device.udid, useRemoteXPC);
|
|
248
246
|
try {
|
|
249
247
|
return await client.listApplications({ applicationType, returnAttributes });
|
|
@@ -314,12 +312,12 @@ async function background(seconds) {
|
|
|
314
312
|
}
|
|
315
313
|
}
|
|
316
314
|
};
|
|
317
|
-
if (seconds &&
|
|
315
|
+
if (seconds && typeof seconds !== 'number' && Object.hasOwn(seconds, 'timeout')) {
|
|
318
316
|
const timeout = seconds.timeout;
|
|
319
317
|
selectEndpoint(isNaN(Number(timeout)) ? timeout : parseFloat(String(timeout)) / 1000.0);
|
|
320
318
|
}
|
|
321
319
|
else {
|
|
322
|
-
selectEndpoint(
|
|
320
|
+
selectEndpoint(typeof seconds === 'number' ? seconds : undefined);
|
|
323
321
|
}
|
|
324
322
|
if (!endpoint) {
|
|
325
323
|
throw new driver_1.errors.InvalidArgumentError(`Argument value is expected to be a valid number. ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-strings.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-strings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-strings.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-strings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAQ9C,MAAM,WAAW,yBAAyB;IACxC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,cAAc,EACpB,IAAI,GAAE,yBAA8B,GACnC,OAAO,CAAC,YAAY,CAAC,CAiGvB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAQ/B"}
|
|
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.parseLocalizableStrings = parseLocalizableStrings;
|
|
7
7
|
exports.getStrings = getStrings;
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
9
|
const support_1 = require("appium/support");
|
|
10
|
+
const helpers_1 = require("./helpers");
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
12
|
const constants_1 = require("./constants");
|
|
13
13
|
const STRINGSDICT_RESOURCE = '.stringsdict';
|
|
@@ -33,12 +33,12 @@ async function parseLocalizableStrings(opts = {}) {
|
|
|
33
33
|
tmpRoot = await support_1.tempDir.openDir();
|
|
34
34
|
this.log.info(`Extracting '${app}' into a temporary location to parse its resources`);
|
|
35
35
|
await support_1.zip.extractAllTo(app, tmpRoot);
|
|
36
|
-
const relativeBundleRoot =
|
|
36
|
+
const relativeBundleRoot = (await (0, helpers_1.findApps)(tmpRoot, [constants_1.APP_EXT]))[0];
|
|
37
37
|
this.log.info(`Selecting '${relativeBundleRoot}'`);
|
|
38
38
|
bundleRoot = node_path_1.default.join(tmpRoot, relativeBundleRoot);
|
|
39
39
|
}
|
|
40
40
|
let lprojRoot;
|
|
41
|
-
for (const subfolder of [`${language}.lproj`, localizableStringsDir, ''].filter(
|
|
41
|
+
for (const subfolder of [`${language}.lproj`, localizableStringsDir, ''].filter((x) => typeof x === 'string')) {
|
|
42
42
|
lprojRoot = node_path_1.default.resolve(bundleRoot, subfolder);
|
|
43
43
|
if (await support_1.fs.exists(lprojRoot)) {
|
|
44
44
|
break;
|
|
@@ -67,14 +67,14 @@ async function parseLocalizableStrings(opts = {}) {
|
|
|
67
67
|
this.log.info(message);
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
-
if (
|
|
70
|
+
if ((0, utils_1.isEmpty)(resourcePaths) && lprojRoot && (await support_1.fs.exists(lprojRoot))) {
|
|
71
71
|
const resourceFiles = (await support_1.fs.readdir(lprojRoot))
|
|
72
|
-
.filter((name) =>
|
|
72
|
+
.filter((name) => [STRINGS_RESOURCE, STRINGSDICT_RESOURCE].some((x) => name.endsWith(x)))
|
|
73
73
|
.map((name) => node_path_1.default.resolve(lprojRoot, name));
|
|
74
74
|
resourcePaths.push(...resourceFiles);
|
|
75
75
|
}
|
|
76
76
|
this.log.info(`Got ${support_1.util.pluralize('resource file', resourcePaths.length, true)} in '${lprojRoot}'`);
|
|
77
|
-
if (
|
|
77
|
+
if ((0, utils_1.isEmpty)(resourcePaths)) {
|
|
78
78
|
return {};
|
|
79
79
|
}
|
|
80
80
|
const resultStrings = {};
|
|
@@ -85,14 +85,14 @@ async function parseLocalizableStrings(opts = {}) {
|
|
|
85
85
|
}
|
|
86
86
|
try {
|
|
87
87
|
const data = await readResource(resourcePath);
|
|
88
|
-
this.log.debug(`Parsed ${support_1.util.pluralize('string',
|
|
89
|
-
|
|
88
|
+
this.log.debug(`Parsed ${support_1.util.pluralize('string', Object.keys(data).length, true)} from '${resourcePath}'`);
|
|
89
|
+
(0, utils_1.mergeDeep)(resultStrings, data);
|
|
90
90
|
}
|
|
91
91
|
catch (e) {
|
|
92
92
|
this.log.warn(`Cannot parse '${resourcePath}' resource. Original error: ${e.message}`);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
this.log.info(`Retrieved ${support_1.util.pluralize('string',
|
|
95
|
+
this.log.info(`Retrieved ${support_1.util.pluralize('string', Object.keys(resultStrings).length, true)} from '${lprojRoot}'`);
|
|
96
96
|
return resultStrings;
|
|
97
97
|
}
|
|
98
98
|
finally {
|
|
@@ -123,8 +123,8 @@ async function getStrings(language, stringFile = null) {
|
|
|
123
123
|
}
|
|
124
124
|
async function readResource(resourcePath) {
|
|
125
125
|
const data = await support_1.plist.parsePlistFile(resourcePath);
|
|
126
|
-
return
|
|
127
|
-
result[key] =
|
|
126
|
+
return Object.entries(data).reduce((result, [key, value]) => {
|
|
127
|
+
result[key] = typeof value === 'string' ? value : JSON.stringify(value);
|
|
128
128
|
return result;
|
|
129
129
|
}, {});
|
|
130
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-strings.js","sourceRoot":"","sources":["../../../lib/commands/app-strings.ts"],"names":[],"mappings":";;;;;AAsBA,
|
|
1
|
+
{"version":3,"file":"app-strings.js","sourceRoot":"","sources":["../../../lib/commands/app-strings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance.d.ts","sourceRoot":"","sources":["../../../lib/commands/appearance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appearance.d.ts","sourceRoot":"","sources":["../../../lib/commands/appearance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAGnC;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,MAAM,GAAG,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAC,CAAC,CAqBvF"}
|
|
@@ -1,11 +1,7 @@
|
|
|
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.mobileSetAppearance = mobileSetAppearance;
|
|
7
4
|
exports.mobileGetAppearance = mobileGetAppearance;
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
5
|
const support_1 = require("appium/support");
|
|
10
6
|
/**
|
|
11
7
|
* Set the device's UI appearance style
|
|
@@ -15,7 +11,7 @@ const support_1 = require("appium/support");
|
|
|
15
11
|
* @throws If the current platform does not support UI appearance changes
|
|
16
12
|
*/
|
|
17
13
|
async function mobileSetAppearance(style) {
|
|
18
|
-
if (!['light', 'dark'].includes(
|
|
14
|
+
if (!['light', 'dark'].includes(String(style).toLowerCase())) {
|
|
19
15
|
throw new Error(`The 'style' value is expected to equal either 'light' or 'dark'`);
|
|
20
16
|
}
|
|
21
17
|
if (support_1.util.compareVersions(this.opts.platformVersion, '<', '12.0')) {
|
|
@@ -38,7 +34,7 @@ async function mobileSetAppearance(style) {
|
|
|
38
34
|
this.log.debug(e.stack);
|
|
39
35
|
}
|
|
40
36
|
// Fall back to the ugly Siri workaround if the current SDK is too old
|
|
41
|
-
await this.mobileSiriCommand(`Turn ${
|
|
37
|
+
await this.mobileSiriCommand(`Turn ${String(style).toLowerCase() === 'dark' ? 'on' : 'off'} dark mode`);
|
|
42
38
|
}
|
|
43
39
|
/**
|
|
44
40
|
* Get the device's UI appearance style.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance.js","sourceRoot":"","sources":["../../../lib/commands/appearance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appearance.js","sourceRoot":"","sources":["../../../lib/commands/appearance.ts"],"names":[],"mappings":";;AAYA,kDA6BC;AAQD,kDAqBC;AAtED,4CAAoC;AAKpC;;;;;;GAMG;AACI,KAAK,UAAU,mBAAmB,CAEvC,KAAuB;IAEvB,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,cAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAyB,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAO,IAAI,CAAC,MAAoB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,MAAM,EAAE,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,CAAC,CAAC;QAChF,OAAO;IACT,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,sEAAsE;IACtE,MAAM,IAAI,CAAC,iBAAiB,CAC1B,QAAQ,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,YAAY,CAC1E,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB;IACvC,IAAI,cAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAyB,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC;QAC3E,OAAO,EAAC,KAAK,EAAE,aAAa,EAAC,CAAC;IAChC,CAAC;IAED,IAAI,KAAwB,CAAC;IAC7B,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,KAAK,GAAG,CAAC,MAAO,IAAI,CAAC,MAAoB,CAAC,aAAa,EAAE,CAAU,CAAC;QACtE,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CACxC,kBAAkB,EAClB,KAAK,CACN,CAAC;QACF,KAAK,GAAG,CAAC,UAAU,EAAE,kBAAkB,IAAI,SAAS,CAAU,CAAC;IACjE,CAAC;IACD,OAAO;QACL,KAAK,EAAE,KAAc;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.mobileGetBatteryInfo = mobileGetBatteryInfo;
|
|
4
4
|
const battery_info_client_1 = require("../device/battery-info-client");
|
|
5
|
-
const
|
|
5
|
+
const helpers_1 = require("./helpers");
|
|
6
6
|
/**
|
|
7
7
|
* Reads the battery information from the device under test.
|
|
8
8
|
*
|
|
@@ -12,7 +12,7 @@ const utils_1 = require("../utils");
|
|
|
12
12
|
*/
|
|
13
13
|
async function mobileGetBatteryInfo() {
|
|
14
14
|
let batteryInfoFromShimService = {};
|
|
15
|
-
if ((0,
|
|
15
|
+
if ((0, helpers_1.isIos18OrNewer)(this.opts) && this.isRealDevice()) {
|
|
16
16
|
try {
|
|
17
17
|
batteryInfoFromShimService = await new battery_info_client_1.BatteryInfoClient(this.device.udid).getAdvancedInfo();
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"battery.js","sourceRoot":"","sources":["../../../lib/commands/battery.ts"],"names":[],"mappings":";;AAYA,oDAiBC;AA7BD,uEAA0F;AAC1F,
|
|
1
|
+
{"version":3,"file":"battery.js","sourceRoot":"","sources":["../../../lib/commands/battery.ts"],"names":[],"mappings":";;AAYA,oDAiBC;AA7BD,uEAA0F;AAC1F,uCAAyC;AAIzC;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB;IAGxC,IAAI,0BAA0B,GAAwB,EAAE,CAAC;IACzD,IAAI,IAAA,wBAAc,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QACrD,IAAI,CAAC;YACH,0BAA0B,GAAG,MAAM,IAAI,uCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QAC/F,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uDAAuD,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAmB,kBAAkB,EAAE,KAAK,CAAC,CAAC;IAChG,OAAO;QACL,GAAG,kBAAkB;QACrB,QAAQ,EAAE,0BAA0B;KACrC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EAEnB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAGjB,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EAEnB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAGjB,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAC;AAYvC,eAAO,MAAM,uBAAuB,GAAI,aAAa,MAAM,wBACA,CAAC;AAE5D;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB,CAQ9E;AAED,yEAAyE;AACzE,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX,kBAAkB,CAepB"}
|