appium-android-driver 7.1.2 → 7.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/build/lib/commands/actions.js +13 -13
- package/build/lib/commands/actions.js.map +1 -1
- package/build/lib/commands/app-management.d.ts.map +1 -1
- package/build/lib/commands/app-management.js +14 -17
- package/build/lib/commands/app-management.js.map +1 -1
- package/build/lib/commands/context.js +5 -9
- package/build/lib/commands/context.js.map +1 -1
- package/build/lib/commands/deviceidle.js +1 -1
- package/build/lib/commands/deviceidle.js.map +1 -1
- package/build/lib/commands/element.js +2 -2
- package/build/lib/commands/element.js.map +1 -1
- package/build/lib/commands/file-actions.d.ts.map +1 -1
- package/build/lib/commands/file-actions.js +14 -16
- package/build/lib/commands/file-actions.js.map +1 -1
- package/build/lib/commands/general.d.ts.map +1 -1
- package/build/lib/commands/general.js +23 -27
- package/build/lib/commands/general.js.map +1 -1
- package/build/lib/commands/ime.d.ts.map +1 -1
- package/build/lib/commands/ime.js +6 -7
- package/build/lib/commands/ime.js.map +1 -1
- package/build/lib/commands/intent.js +7 -7
- package/build/lib/commands/intent.js.map +1 -1
- package/build/lib/commands/log.d.ts.map +1 -1
- package/build/lib/commands/log.js +2 -3
- package/build/lib/commands/log.js.map +1 -1
- package/build/lib/commands/media-projection.d.ts.map +1 -1
- package/build/lib/commands/media-projection.js +6 -9
- package/build/lib/commands/media-projection.js.map +1 -1
- package/build/lib/commands/network.d.ts.map +1 -1
- package/build/lib/commands/network.js +30 -37
- package/build/lib/commands/network.js.map +1 -1
- package/build/lib/commands/performance.js +5 -5
- package/build/lib/commands/performance.js.map +1 -1
- package/build/lib/commands/permissions.d.ts.map +1 -1
- package/build/lib/commands/permissions.js +9 -12
- package/build/lib/commands/permissions.js.map +1 -1
- package/build/lib/commands/recordscreen.d.ts.map +1 -1
- package/build/lib/commands/recordscreen.js +8 -10
- package/build/lib/commands/recordscreen.js.map +1 -1
- package/build/lib/commands/shell.d.ts.map +1 -1
- package/build/lib/commands/shell.js +3 -4
- package/build/lib/commands/shell.js.map +1 -1
- package/build/lib/commands/streamscreen.d.ts.map +1 -1
- package/build/lib/commands/streamscreen.js +3 -4
- package/build/lib/commands/streamscreen.js.map +1 -1
- package/build/lib/commands/system-bars.js +2 -2
- package/build/lib/commands/system-bars.js.map +1 -1
- package/build/lib/commands/touch.js +1 -1
- package/build/lib/commands/touch.js.map +1 -1
- package/lib/commands/actions.js +13 -13
- package/lib/commands/app-management.js +14 -17
- package/lib/commands/context.js +7 -7
- package/lib/commands/deviceidle.js +1 -1
- package/lib/commands/element.js +2 -2
- package/lib/commands/file-actions.js +14 -16
- package/lib/commands/general.js +23 -26
- package/lib/commands/ime.js +6 -7
- package/lib/commands/intent.js +7 -7
- package/lib/commands/log.js +2 -3
- package/lib/commands/media-projection.js +6 -9
- package/lib/commands/network.js +30 -37
- package/lib/commands/performance.js +5 -5
- package/lib/commands/permissions.js +9 -11
- package/lib/commands/recordscreen.js +8 -10
- package/lib/commands/shell.js +3 -4
- package/lib/commands/streamscreen.js +3 -4
- package/lib/commands/system-bars.js +2 -2
- package/lib/commands/touch.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [7.1.3](https://github.com/appium/appium-android-driver/compare/v7.1.2...v7.1.3) (2023-10-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Miscellaneous Chores
|
|
5
|
+
|
|
6
|
+
* Remove adb typing workarounds ([#870](https://github.com/appium/appium-android-driver/issues/870)) ([d1ce8d6](https://github.com/appium/appium-android-driver/commit/d1ce8d6fbbfb6567111bb8bb0436bc539997fa6b))
|
|
7
|
+
|
|
1
8
|
## [7.1.2](https://github.com/appium/appium-android-driver/compare/v7.1.1...v7.1.2) (2023-10-17)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -79,7 +79,7 @@ const ActionsMixin = {
|
|
|
79
79
|
return await this.lock(seconds);
|
|
80
80
|
},
|
|
81
81
|
async lock(seconds) {
|
|
82
|
-
await
|
|
82
|
+
await this.adb.lock();
|
|
83
83
|
if (Number.isNaN(seconds)) {
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
@@ -91,22 +91,22 @@ const ActionsMixin = {
|
|
|
91
91
|
await this.unlock();
|
|
92
92
|
},
|
|
93
93
|
async isLocked() {
|
|
94
|
-
return await
|
|
94
|
+
return await this.adb.isScreenLocked();
|
|
95
95
|
},
|
|
96
96
|
async unlock() {
|
|
97
|
-
return await helpers_1.AndroidHelpers.unlock(this,
|
|
97
|
+
return await helpers_1.AndroidHelpers.unlock(this, this.adb, this.caps);
|
|
98
98
|
},
|
|
99
99
|
async openNotifications() {
|
|
100
100
|
throw new driver_1.errors.NotImplementedError('Not implemented');
|
|
101
101
|
},
|
|
102
102
|
async setLocation(latitude, longitude) {
|
|
103
|
-
await
|
|
103
|
+
await this.adb.sendTelnetCommand(`geo fix ${longitude} ${latitude}`);
|
|
104
104
|
},
|
|
105
105
|
async fingerprint(fingerprintId) {
|
|
106
106
|
if (!this.isEmulator()) {
|
|
107
107
|
this.log.errorAndThrow('fingerprint method is only available for emulators');
|
|
108
108
|
}
|
|
109
|
-
await
|
|
109
|
+
await this.adb.fingerprint(String(fingerprintId));
|
|
110
110
|
},
|
|
111
111
|
async mobileFingerprint(opts) {
|
|
112
112
|
const { fingerprintId } = (0, utils_1.requireArgs)('fingerprintId', opts);
|
|
@@ -116,7 +116,7 @@ const ActionsMixin = {
|
|
|
116
116
|
if (!this.isEmulator()) {
|
|
117
117
|
this.log.errorAndThrow('sendSMS method is only available for emulators');
|
|
118
118
|
}
|
|
119
|
-
await
|
|
119
|
+
await this.adb.sendSMS(phoneNumber, message);
|
|
120
120
|
},
|
|
121
121
|
async mobileSendSms(opts) {
|
|
122
122
|
const { phoneNumber, message } = (0, utils_1.requireArgs)(['phoneNumber', 'message'], opts);
|
|
@@ -126,7 +126,7 @@ const ActionsMixin = {
|
|
|
126
126
|
if (!this.isEmulator()) {
|
|
127
127
|
this.log.errorAndThrow('gsmCall method is only available for emulators');
|
|
128
128
|
}
|
|
129
|
-
await
|
|
129
|
+
await this.adb.gsmCall(phoneNumber, /** @type {any} */ (action));
|
|
130
130
|
},
|
|
131
131
|
async mobileGsmCall(opts) {
|
|
132
132
|
const { phoneNumber, action } = (0, utils_1.requireArgs)(['phoneNumber', 'action'], opts);
|
|
@@ -136,7 +136,7 @@ const ActionsMixin = {
|
|
|
136
136
|
if (!this.isEmulator()) {
|
|
137
137
|
this.log.errorAndThrow('gsmSignal method is only available for emulators');
|
|
138
138
|
}
|
|
139
|
-
await
|
|
139
|
+
await this.adb.gsmSignal(signalStrengh);
|
|
140
140
|
},
|
|
141
141
|
async mobileGsmSignal(opts) {
|
|
142
142
|
const { strength } = (0, utils_1.requireArgs)('strength', opts);
|
|
@@ -146,7 +146,7 @@ const ActionsMixin = {
|
|
|
146
146
|
if (!this.isEmulator()) {
|
|
147
147
|
this.log.errorAndThrow('gsmVoice method is only available for emulators');
|
|
148
148
|
}
|
|
149
|
-
await
|
|
149
|
+
await this.adb.gsmVoice(state);
|
|
150
150
|
},
|
|
151
151
|
async mobileGsmVoice(opts) {
|
|
152
152
|
const { state } = (0, utils_1.requireArgs)('state', opts);
|
|
@@ -156,7 +156,7 @@ const ActionsMixin = {
|
|
|
156
156
|
if (!this.isEmulator()) {
|
|
157
157
|
this.log.errorAndThrow('powerAC method is only available for emulators');
|
|
158
158
|
}
|
|
159
|
-
await
|
|
159
|
+
await this.adb.powerAC(state);
|
|
160
160
|
},
|
|
161
161
|
async mobilePowerAc(opts) {
|
|
162
162
|
const { state } = (0, utils_1.requireArgs)('state', opts);
|
|
@@ -166,7 +166,7 @@ const ActionsMixin = {
|
|
|
166
166
|
if (!this.isEmulator()) {
|
|
167
167
|
this.log.errorAndThrow('powerCapacity method is only available for emulators');
|
|
168
168
|
}
|
|
169
|
-
await
|
|
169
|
+
await this.adb.powerCapacity(batteryPercent);
|
|
170
170
|
},
|
|
171
171
|
async mobilePowerCapacity(opts) {
|
|
172
172
|
const { percent } = (0, utils_1.requireArgs)('percent', opts);
|
|
@@ -176,7 +176,7 @@ const ActionsMixin = {
|
|
|
176
176
|
if (!this.isEmulator()) {
|
|
177
177
|
this.log.errorAndThrow('networkSpeed method is only available for emulators');
|
|
178
178
|
}
|
|
179
|
-
await
|
|
179
|
+
await this.adb.networkSpeed(networkSpeed);
|
|
180
180
|
},
|
|
181
181
|
async mobileNetworkSpeed(opts) {
|
|
182
182
|
const { speed } = (0, utils_1.requireArgs)('speed', opts);
|
|
@@ -193,7 +193,7 @@ const ActionsMixin = {
|
|
|
193
193
|
if (!this.isEmulator()) {
|
|
194
194
|
this.log.errorAndThrow('sensorSet method is only available for emulators');
|
|
195
195
|
}
|
|
196
|
-
await
|
|
196
|
+
await this.adb.sensorSet(sensorType, /** @type {any} */ (value));
|
|
197
197
|
},
|
|
198
198
|
async getScreenshot() {
|
|
199
199
|
throw new driver_1.errors.NotImplementedError('Not implemented');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":";kBA8Ka,OAAO,YAAY,EAAE,GAAG;AAlKrC;;;GAGG;AACH,kCAHU,OAAO,UAAU,EAAE,kBAAkB,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA0J3F"}
|
|
@@ -18,23 +18,22 @@ const RESOLVER_ACTIVITY_NAME = 'android/com.android.internal.app.ResolverActivit
|
|
|
18
18
|
*/
|
|
19
19
|
const AppManagementMixin = {
|
|
20
20
|
async isAppInstalled(appId) {
|
|
21
|
-
return await
|
|
21
|
+
return await this.adb.isAppInstalled(appId);
|
|
22
22
|
},
|
|
23
23
|
async mobileIsAppInstalled(opts) {
|
|
24
24
|
const { appId } = (0, utils_1.requireArgs)('appId', opts);
|
|
25
25
|
return await this.isAppInstalled(appId);
|
|
26
26
|
},
|
|
27
27
|
async queryAppState(appId) {
|
|
28
|
-
const adb = /** @type {ADB} */ (this.adb);
|
|
29
28
|
this.log.info(`Querying the state of '${appId}'`);
|
|
30
|
-
if (!(await adb.isAppInstalled(appId))) {
|
|
29
|
+
if (!(await this.adb.isAppInstalled(appId))) {
|
|
31
30
|
return helpers_1.APP_STATE.NOT_INSTALLED;
|
|
32
31
|
}
|
|
33
|
-
if (!(await adb.processExists(appId))) {
|
|
32
|
+
if (!(await this.adb.processExists(appId))) {
|
|
34
33
|
return helpers_1.APP_STATE.NOT_RUNNING;
|
|
35
34
|
}
|
|
36
35
|
const appIdRe = new RegExp(`\\b${lodash_1.default.escapeRegExp(appId)}/`);
|
|
37
|
-
for (const line of (await adb.dumpWindows()).split('\n')) {
|
|
36
|
+
for (const line of (await this.adb.dumpWindows()).split('\n')) {
|
|
38
37
|
if (appIdRe.test(line) && ['mCurrentFocus', 'mFocusedApp'].some((x) => line.includes(x))) {
|
|
39
38
|
return helpers_1.APP_STATE.RUNNING_IN_FOREGROUND;
|
|
40
39
|
}
|
|
@@ -46,9 +45,8 @@ const AppManagementMixin = {
|
|
|
46
45
|
return await this.queryAppState(appId);
|
|
47
46
|
},
|
|
48
47
|
async activateApp(appId) {
|
|
49
|
-
const adb = /** @type {ADB} */ (this.adb);
|
|
50
48
|
this.log.debug(`Activating '${appId}'`);
|
|
51
|
-
const apiLevel = await adb.getApiLevel();
|
|
49
|
+
const apiLevel = await this.adb.getApiLevel();
|
|
52
50
|
// Fallback to Monkey in older APIs
|
|
53
51
|
if (apiLevel < 24) {
|
|
54
52
|
// The monkey command could raise an issue as https://stackoverflow.com/questions/44860475/how-to-use-the-monkey-command-with-an-android-system-that-doesnt-have-physical
|
|
@@ -56,7 +54,7 @@ const AppManagementMixin = {
|
|
|
56
54
|
const cmd = ['monkey', '-p', appId, '-c', 'android.intent.category.LAUNCHER', '1'];
|
|
57
55
|
let output = '';
|
|
58
56
|
try {
|
|
59
|
-
output = await adb.shell(cmd);
|
|
57
|
+
output = await this.adb.shell(cmd);
|
|
60
58
|
this.log.debug(`Command stdout: ${output}`);
|
|
61
59
|
}
|
|
62
60
|
catch (e) {
|
|
@@ -67,14 +65,14 @@ const AppManagementMixin = {
|
|
|
67
65
|
}
|
|
68
66
|
return;
|
|
69
67
|
}
|
|
70
|
-
let activityName = await adb.resolveLaunchableActivity(appId);
|
|
68
|
+
let activityName = await this.adb.resolveLaunchableActivity(appId);
|
|
71
69
|
if (activityName === RESOLVER_ACTIVITY_NAME) {
|
|
72
70
|
// https://github.com/appium/appium/issues/17128
|
|
73
71
|
this.log.debug(`The launchable activity name of '${appId}' was resolved to '${activityName}'. ` +
|
|
74
72
|
`Switching the resolver to not use cmd`);
|
|
75
|
-
activityName = await adb.resolveLaunchableActivity(appId, { preferCmd: false });
|
|
73
|
+
activityName = await this.adb.resolveLaunchableActivity(appId, { preferCmd: false });
|
|
76
74
|
}
|
|
77
|
-
const stdout = await adb.shell([
|
|
75
|
+
const stdout = await this.adb.shell([
|
|
78
76
|
'am',
|
|
79
77
|
apiLevel < 26 ? 'start' : 'start-activity',
|
|
80
78
|
'-a',
|
|
@@ -99,20 +97,19 @@ const AppManagementMixin = {
|
|
|
99
97
|
return await this.activateApp(appId);
|
|
100
98
|
},
|
|
101
99
|
async removeApp(appId, opts = {}) {
|
|
102
|
-
return await
|
|
100
|
+
return await this.adb.uninstallApk(appId, opts);
|
|
103
101
|
},
|
|
104
102
|
async mobileRemoveApp(opts) {
|
|
105
103
|
const { appId } = (0, utils_1.requireArgs)('appId', opts);
|
|
106
104
|
return await this.removeApp(appId, opts);
|
|
107
105
|
},
|
|
108
106
|
async terminateApp(appId, options = {}) {
|
|
109
|
-
const adb = /** @type {ADB} */ (this.adb);
|
|
110
107
|
this.log.info(`Terminating '${appId}'`);
|
|
111
|
-
if (!(await adb.processExists(appId))) {
|
|
108
|
+
if (!(await this.adb.processExists(appId))) {
|
|
112
109
|
this.log.info(`The app '${appId}' is not running`);
|
|
113
110
|
return false;
|
|
114
111
|
}
|
|
115
|
-
await adb.forceStop(appId);
|
|
112
|
+
await this.adb.forceStop(appId);
|
|
116
113
|
const timeout = support_1.util.hasValue(options.timeout) && !Number.isNaN(options.timeout)
|
|
117
114
|
? parseInt(String(options.timeout), 10)
|
|
118
115
|
: 500;
|
|
@@ -136,7 +133,7 @@ const AppManagementMixin = {
|
|
|
136
133
|
},
|
|
137
134
|
async installApp(appPath, opts) {
|
|
138
135
|
const localPath = await this.helpers.configureApp(appPath, APP_EXTENSIONS);
|
|
139
|
-
await
|
|
136
|
+
await this.adb.install(localPath, opts);
|
|
140
137
|
},
|
|
141
138
|
async mobileInstallApp(opts) {
|
|
142
139
|
const { appPath } = (0, utils_1.requireArgs)('appPath', opts);
|
|
@@ -144,7 +141,7 @@ const AppManagementMixin = {
|
|
|
144
141
|
},
|
|
145
142
|
async mobileClearApp(opts) {
|
|
146
143
|
const { appId } = (0, utils_1.requireArgs)('appId', opts);
|
|
147
|
-
await
|
|
144
|
+
await this.adb.clear(appId);
|
|
148
145
|
},
|
|
149
146
|
};
|
|
150
147
|
(0, mixins_1.mixin)(AppManagementMixin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,6CAAqC;AACrC,uCAA0C;AAC1C,oDAAuB;AACvB,wCAAqC;AACrC,oCAAqC;AACrC,qCAA+B;AAE/B,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACzC,MAAM,sBAAsB,GAAG,mDAAmD,CAAC;AAEnF;;;GAGG;AACH,MAAM,kBAAkB,GAAG;IACzB,KAAK,CAAC,cAAc,CAAC,KAAK;QACxB,OAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"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"}
|
|
@@ -49,8 +49,7 @@ const ContextMixin = {
|
|
|
49
49
|
return this.curContext || this.defaultContextName();
|
|
50
50
|
},
|
|
51
51
|
async getContexts() {
|
|
52
|
-
const webviewsMapping = await helpers_1.WebviewHelpers.getWebViewsMapping(
|
|
53
|
-
/** @type {ADB} */ (this.adb), this.opts);
|
|
52
|
+
const webviewsMapping = await helpers_1.WebviewHelpers.getWebViewsMapping(this.adb, this.opts);
|
|
54
53
|
return this.assignContexts(webviewsMapping);
|
|
55
54
|
},
|
|
56
55
|
async setContext(name) {
|
|
@@ -65,8 +64,7 @@ const ContextMixin = {
|
|
|
65
64
|
if (name === this.curContext) {
|
|
66
65
|
return;
|
|
67
66
|
}
|
|
68
|
-
const webviewsMapping = await helpers_1.WebviewHelpers.getWebViewsMapping(
|
|
69
|
-
/** @type {ADB} */ (this.adb), this.opts);
|
|
67
|
+
const webviewsMapping = await helpers_1.WebviewHelpers.getWebViewsMapping(this.adb, this.opts);
|
|
70
68
|
const contexts = this.assignContexts(webviewsMapping);
|
|
71
69
|
// if the context we want doesn't exist, fail
|
|
72
70
|
if (!lodash_1.default.includes(contexts, name)) {
|
|
@@ -82,7 +80,7 @@ const ContextMixin = {
|
|
|
82
80
|
webviewDevtoolsPort: this.opts.webviewDevtoolsPort,
|
|
83
81
|
enableWebviewDetailsCollection: true,
|
|
84
82
|
};
|
|
85
|
-
return await helpers_1.WebviewHelpers.getWebViewsMapping(
|
|
83
|
+
return await helpers_1.WebviewHelpers.getWebViewsMapping(this.adb, opts);
|
|
86
84
|
},
|
|
87
85
|
assignContexts(webviewsMapping) {
|
|
88
86
|
const opts = Object.assign({ isChromeSession: this.isChromeSession }, this.opts);
|
|
@@ -190,8 +188,7 @@ const ContextMixin = {
|
|
|
190
188
|
}
|
|
191
189
|
}
|
|
192
190
|
cd = await this.setupNewChromedriver(opts,
|
|
193
|
-
/** @type {string} */ (
|
|
194
|
-
/** @type {ADB} */ (this.adb), context);
|
|
191
|
+
/** @type {string} */ (this.adb.curDeviceId), this.adb, context);
|
|
195
192
|
// bind our stop/exit handler, passing in context so we know which
|
|
196
193
|
// one stopped unexpectedly
|
|
197
194
|
cd.on(appium_chromedriver_1.default.EVENT_CHANGED, (msg) => {
|
|
@@ -294,8 +291,7 @@ const ContextMixin = {
|
|
|
294
291
|
opts.chromeAndroidActivity = this.opts.appActivity;
|
|
295
292
|
}
|
|
296
293
|
this.chromedriver = await this.setupNewChromedriver(opts,
|
|
297
|
-
/** @type {string} */ (
|
|
298
|
-
/** @type {ADB} */ (this.adb));
|
|
294
|
+
/** @type {string} */ (this.adb.curDeviceId), this.adb);
|
|
299
295
|
this.chromedriver.on(appium_chromedriver_1.default.EVENT_CHANGED, (msg) => {
|
|
300
296
|
if (msg.state === appium_chromedriver_1.default.STATE_STOPPED) {
|
|
301
297
|
this.onChromedriverStop(helpers_1.CHROMIUM_WIN);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ const DeviceidleMixin = {
|
|
|
40
40
|
default:
|
|
41
41
|
throw new driver_1.errors.InvalidArgumentError(`action must be one of ${JSON.stringify(SUPPORTED_ACTIONS)}. Got '${action}' instead`);
|
|
42
42
|
}
|
|
43
|
-
await (
|
|
43
|
+
await (this.adb).shellChunks(argsGenerator, packagesArr);
|
|
44
44
|
},
|
|
45
45
|
};
|
|
46
46
|
(0, mixins_1.mixin)(DeviceidleMixin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceidle.js","sourceRoot":"","sources":["../../../lib/commands/deviceidle.js"],"names":[],"mappings":";;;;;AAAA,0CAAqC;AACrC,oDAAuB;AACvB,qCAA+B;AAE/B,MAAM,iBAAiB,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;AAE9D;;;GAGG;AACH,MAAM,eAAe,GAAG;IACtB;;;;;;OAMG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAI;QACzB,MAAM,EACJ,MAAM,EACN,QAAQ,GACT,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;YAClD,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,gDAAgD,CAAC,CAAC;SACzF;QAED,uBAAuB;QACvB,MAAM,WAAW,GAAG,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChE,uBAAuB;QACvB,MAAM,UAAU,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAC1D,sCAAsC;QACtC,IAAI,aAAa,CAAC;QAClB,QAAQ,MAAM,EAAE;YACd,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,aAAa,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBACpD,MAAM;YACR,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,aAAa,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBACpD,MAAM;YACR;gBACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,yBAAyB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,MAAM,WAAW,CACtF,CAAC;SACL;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"deviceidle.js","sourceRoot":"","sources":["../../../lib/commands/deviceidle.js"],"names":[],"mappings":";;;;;AAAA,0CAAqC;AACrC,oDAAuB;AACvB,qCAA+B;AAE/B,MAAM,iBAAiB,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;AAE9D;;;GAGG;AACH,MAAM,eAAe,GAAG;IACtB;;;;;;OAMG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAI;QACzB,MAAM,EACJ,MAAM,EACN,QAAQ,GACT,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;YAClD,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,gDAAgD,CAAC,CAAC;SACzF;QAED,uBAAuB;QACvB,MAAM,WAAW,GAAG,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChE,uBAAuB;QACvB,MAAM,UAAU,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAC1D,sCAAsC;QACtC,IAAI,aAAa,CAAC;QAClB,QAAQ,MAAM,EAAE;YACd,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,aAAa,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBACpD,MAAM;YACR,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,aAAa,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBACpD,MAAM;YACR;gBACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,yBAAyB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,UAAU,MAAM,WAAW,CACtF,CAAC;SACL;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,eAAe,CAAC,CAAC;AAEvB,kBAAe,eAAe,CAAC;AAE/B;;GAEG"}
|
|
@@ -60,7 +60,7 @@ const ElementMixin = {
|
|
|
60
60
|
// first, make sure we are focused on the element
|
|
61
61
|
await this.click(elementId);
|
|
62
62
|
// then send through adb
|
|
63
|
-
await
|
|
63
|
+
await this.adb.inputText(/** @type {string} */ (text));
|
|
64
64
|
},
|
|
65
65
|
async getText(elementId) {
|
|
66
66
|
throw new driver_1.errors.NotImplementedError('Not implemented');
|
|
@@ -83,7 +83,7 @@ const ElementMixin = {
|
|
|
83
83
|
while (remainingLength > 0) {
|
|
84
84
|
let lengthToSend = remainingLength < 50 ? remainingLength : 50;
|
|
85
85
|
this.log.debug(`Sending ${lengthToSend} clear characters to device`);
|
|
86
|
-
await
|
|
86
|
+
await this.adb.clearTextField(lengthToSend);
|
|
87
87
|
remainingLength -= lengthToSend;
|
|
88
88
|
}
|
|
89
89
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAC/B,uCAAuC;AACvC,0CAAqC;AAErC;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS;QACrC,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAS;QACrB,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,SAAS;QAC9B,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,KAAK,MAAM,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAS;QAC5B,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,KAAK,MAAM,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAS;QAC7B,OAAO,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,KAAK,MAAM,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,GAAG,KAAK;QACpD,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,IAAI,YAAY,KAAK,EAAE;YACzB,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACtB;QAED,IAAI,MAAM,GAAG;YACX,SAAS;YACT,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;YAClB,OAAO;YACP,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;SAC3C,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAAM;QAC5B,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS;QAC5B,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS;QAChC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS;QACrC,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,IAAI,YAAY,KAAK,EAAE;YACzB,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACtB;QAED,iDAAiD;QACjD,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE5B,wBAAwB;QACxB,MAAM,
|
|
1
|
+
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/file-actions.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"file-actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/file-actions.js"],"names":[],"mappings":";kBAoVa,OAAO,YAAY,EAAE,GAAG;AAnQrC;;;GAGG;AACH,gCAHU,OAAO,UAAU,EAAE,gBAAgB,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CAqJzF"}
|
|
@@ -80,7 +80,6 @@ function escapePath(p) {
|
|
|
80
80
|
*/
|
|
81
81
|
const FileActionsMixin = {
|
|
82
82
|
async pullFile(remotePath) {
|
|
83
|
-
const adb = /** @type {ADB} */ (this.adb);
|
|
84
83
|
if (remotePath.endsWith('/')) {
|
|
85
84
|
throw new driver_1.errors.InvalidArgumentError(`It is expected that remote path points to a file and not to a folder. ` +
|
|
86
85
|
`'${remotePath}' is given instead`);
|
|
@@ -91,8 +90,8 @@ const FileActionsMixin = {
|
|
|
91
90
|
this.log.debug(`Parsed package identifier '${packageId}' from '${remotePath}'. Will get the data from '${pathInContainer}'`);
|
|
92
91
|
tmpDestination = `/data/local/tmp/${path_1.default.posix.basename(pathInContainer)}`;
|
|
93
92
|
try {
|
|
94
|
-
await adb.shell(['run-as', packageId, `chmod 777 '${escapePath(pathInContainer)}'`]);
|
|
95
|
-
await adb.shell([
|
|
93
|
+
await this.adb.shell(['run-as', packageId, `chmod 777 '${escapePath(pathInContainer)}'`]);
|
|
94
|
+
await this.adb.shell([
|
|
96
95
|
'run-as',
|
|
97
96
|
packageId,
|
|
98
97
|
`cp -f '${escapePath(pathInContainer)}' '${escapePath(tmpDestination)}'`,
|
|
@@ -106,7 +105,7 @@ const FileActionsMixin = {
|
|
|
106
105
|
}
|
|
107
106
|
const localFile = await support_1.tempDir.path({ prefix: 'appium', suffix: '.tmp' });
|
|
108
107
|
try {
|
|
109
|
-
await adb.pull(tmpDestination || remotePath, localFile);
|
|
108
|
+
await this.adb.pull(tmpDestination || remotePath, localFile);
|
|
110
109
|
return (await support_1.util.toInMemoryBase64(localFile)).toString();
|
|
111
110
|
}
|
|
112
111
|
finally {
|
|
@@ -114,7 +113,7 @@ const FileActionsMixin = {
|
|
|
114
113
|
await support_1.fs.unlink(localFile);
|
|
115
114
|
}
|
|
116
115
|
if (tmpDestination) {
|
|
117
|
-
await adb.shell(['rm', '-f', tmpDestination]);
|
|
116
|
+
await this.adb.shell(['rm', '-f', tmpDestination]);
|
|
118
117
|
}
|
|
119
118
|
}
|
|
120
119
|
},
|
|
@@ -135,7 +134,6 @@ const FileActionsMixin = {
|
|
|
135
134
|
}
|
|
136
135
|
const content = Buffer.from(base64Data, 'base64');
|
|
137
136
|
let tmpDestination = null;
|
|
138
|
-
const adb = /** @type {ADB} */ (this.adb);
|
|
139
137
|
try {
|
|
140
138
|
await support_1.fs.writeFile(localFile, content.toString('binary'), 'binary');
|
|
141
139
|
if (remotePath.startsWith(CONTAINER_PATH_MARKER)) {
|
|
@@ -144,15 +142,15 @@ const FileActionsMixin = {
|
|
|
144
142
|
`Will put the data into '${pathInContainer}'`);
|
|
145
143
|
tmpDestination = `/data/local/tmp/${path_1.default.posix.basename(pathInContainer)}`;
|
|
146
144
|
try {
|
|
147
|
-
await adb.shell([
|
|
145
|
+
await this.adb.shell([
|
|
148
146
|
'run-as',
|
|
149
147
|
packageId,
|
|
150
148
|
`mkdir -p '${escapePath(path_1.default.posix.dirname(pathInContainer))}'`,
|
|
151
149
|
]);
|
|
152
|
-
await adb.shell(['run-as', packageId, `touch '${escapePath(pathInContainer)}'`]);
|
|
153
|
-
await adb.shell(['run-as', packageId, `chmod 777 '${escapePath(pathInContainer)}'`]);
|
|
154
|
-
await adb.push(localFile, tmpDestination);
|
|
155
|
-
await adb.shell([
|
|
150
|
+
await this.adb.shell(['run-as', packageId, `touch '${escapePath(pathInContainer)}'`]);
|
|
151
|
+
await this.adb.shell(['run-as', packageId, `chmod 777 '${escapePath(pathInContainer)}'`]);
|
|
152
|
+
await this.adb.push(localFile, tmpDestination);
|
|
153
|
+
await this.adb.shell([
|
|
156
154
|
'run-as',
|
|
157
155
|
packageId,
|
|
158
156
|
`cp -f '${escapePath(tmpDestination)}' '${escapePath(pathInContainer)}'`,
|
|
@@ -166,10 +164,10 @@ const FileActionsMixin = {
|
|
|
166
164
|
}
|
|
167
165
|
else {
|
|
168
166
|
// adb push creates folders and overwrites existing files.
|
|
169
|
-
await adb.push(localFile, remotePath);
|
|
167
|
+
await this.adb.push(localFile, remotePath);
|
|
170
168
|
// if we have pushed a file, it might be a media file, so ensure that
|
|
171
169
|
// apps know about it
|
|
172
|
-
await scanMedia(adb, remotePath, this.log);
|
|
170
|
+
await scanMedia(this.adb, remotePath, this.log);
|
|
173
171
|
}
|
|
174
172
|
}
|
|
175
173
|
finally {
|
|
@@ -177,7 +175,7 @@ const FileActionsMixin = {
|
|
|
177
175
|
await support_1.fs.unlink(localFile);
|
|
178
176
|
}
|
|
179
177
|
if (tmpDestination) {
|
|
180
|
-
await adb.shell(['rm', '-f', tmpDestination]);
|
|
178
|
+
await this.adb.shell(['rm', '-f', tmpDestination]);
|
|
181
179
|
}
|
|
182
180
|
}
|
|
183
181
|
},
|
|
@@ -188,7 +186,7 @@ const FileActionsMixin = {
|
|
|
188
186
|
async pullFolder(remotePath) {
|
|
189
187
|
const tmpRoot = await support_1.tempDir.openDir();
|
|
190
188
|
try {
|
|
191
|
-
await
|
|
189
|
+
await this.adb.pull(remotePath, tmpRoot);
|
|
192
190
|
return (await support_1.zip.toInMemoryZip(tmpRoot, {
|
|
193
191
|
encodeToBase64: true,
|
|
194
192
|
})).toString();
|
|
@@ -207,7 +205,7 @@ const FileActionsMixin = {
|
|
|
207
205
|
throw new driver_1.errors.InvalidArgumentError(`It is expected that remote path points to a folder and not to a file. ` +
|
|
208
206
|
`'${remotePath}' is given instead`);
|
|
209
207
|
}
|
|
210
|
-
return await deleteFileOrFolder.call(this,
|
|
208
|
+
return await deleteFileOrFolder.call(this, this.adb, remotePath);
|
|
211
209
|
},
|
|
212
210
|
};
|
|
213
211
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-actions.js","sourceRoot":"","sources":["../../../lib/commands/file-actions.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,oDAAuB;AACvB,6CAAuD;AACvD,gDAAwB;AACxB,0CAAqC;AACrC,oCAAqC;AACrC,qCAA+B;AAE/B,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,kCAAkC;AAClC,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,IAAI,qBAAqB,cAAc,CAAC,CAAC;AACnF,MAAM,2BAA2B,GAAG,+CAA+C,CAAC;AAEpF;;;;;;;;GAQG;AACH,SAAS,kBAAkB,CAAC,UAAU;IACpC,MAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CACb,kGAAkG;YAChG,IAAI,UAAU,oBAAoB,CACrC,CAAC;KACH;IACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,cAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG;IAC3C,GAAG,EAAE,KAAK,CAAC,6BAA6B,UAAU,GAAG,CAAC,CAAC;IACvD,IAAI;QACF,gDAAgD;QAChD,IAAI,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,GAAG,CAAC,KAAK,CAAC;gBACd,IAAI;gBACJ,WAAW;gBACX,IAAI;gBACJ,2BAA2B;gBAC3B,IAAI;gBACJ,UAAU,UAAU,EAAE;aACvB,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,mCAAmC;QACnC,GAAG,EAAE,IAAI,CACP,wDAAwD,UAAU,MAChE,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OACpB,EAAE,CACH,CAAC;KACH;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,CAAC;IACnB,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,gBAAgB,GAAG;IACvB,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,
|
|
1
|
+
{"version":3,"file":"file-actions.js","sourceRoot":"","sources":["../../../lib/commands/file-actions.js"],"names":[],"mappings":"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"}
|