appium-adb 14.0.7 → 14.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/build/lib/adb.d.ts +2 -0
- package/build/lib/adb.d.ts.map +1 -1
- package/build/lib/adb.js +9 -0
- package/build/lib/adb.js.map +1 -1
- package/build/lib/helpers.d.ts.map +1 -1
- package/build/lib/helpers.js +3 -3
- package/build/lib/helpers.js.map +1 -1
- package/build/lib/logcat.d.ts.map +1 -1
- package/build/lib/logcat.js +16 -6
- package/build/lib/logcat.js.map +1 -1
- package/build/lib/logger.js.map +1 -1
- package/build/lib/tools/aab-utils.d.ts.map +1 -1
- package/build/lib/tools/aab-utils.js +25 -18
- package/build/lib/tools/aab-utils.js.map +1 -1
- package/build/lib/tools/android-manifest.d.ts.map +1 -1
- package/build/lib/tools/android-manifest.js +36 -24
- package/build/lib/tools/android-manifest.js.map +1 -1
- package/build/lib/tools/apk-signing.d.ts.map +1 -1
- package/build/lib/tools/apk-signing.js +58 -37
- package/build/lib/tools/apk-signing.js.map +1 -1
- package/build/lib/tools/apk-utils.d.ts.map +1 -1
- package/build/lib/tools/apk-utils.js +46 -38
- package/build/lib/tools/apk-utils.js.map +1 -1
- package/build/lib/tools/apks-utils.d.ts.map +1 -1
- package/build/lib/tools/apks-utils.js +21 -14
- package/build/lib/tools/apks-utils.js.map +1 -1
- package/build/lib/tools/app-commands.d.ts.map +1 -1
- package/build/lib/tools/app-commands.js +44 -45
- package/build/lib/tools/app-commands.js.map +1 -1
- package/build/lib/tools/device-settings.d.ts.map +1 -1
- package/build/lib/tools/device-settings.js +38 -32
- package/build/lib/tools/device-settings.js.map +1 -1
- package/build/lib/tools/emu-constants.d.ts.map +1 -1
- package/build/lib/tools/emu-constants.js +4 -4
- package/build/lib/tools/emu-constants.js.map +1 -1
- package/build/lib/tools/emulator-commands.d.ts.map +1 -1
- package/build/lib/tools/emulator-commands.js +20 -17
- package/build/lib/tools/emulator-commands.js.map +1 -1
- package/build/lib/tools/fs-commands.d.ts.map +1 -1
- package/build/lib/tools/fs-commands.js +2 -1
- package/build/lib/tools/fs-commands.js.map +1 -1
- package/build/lib/tools/general-commands.d.ts.map +1 -1
- package/build/lib/tools/general-commands.js +11 -15
- package/build/lib/tools/general-commands.js.map +1 -1
- package/build/lib/tools/keyboard-commands.d.ts.map +1 -1
- package/build/lib/tools/keyboard-commands.js.map +1 -1
- package/build/lib/tools/lockmgmt.d.ts.map +1 -1
- package/build/lib/tools/lockmgmt.js +24 -23
- package/build/lib/tools/lockmgmt.js.map +1 -1
- package/build/lib/tools/logcat-commands.d.ts.map +1 -1
- package/build/lib/tools/logcat-commands.js.map +1 -1
- package/build/lib/tools/network-commands.d.ts.map +1 -1
- package/build/lib/tools/network-commands.js +0 -1
- package/build/lib/tools/network-commands.js.map +1 -1
- package/build/lib/tools/process-commands.d.ts.map +1 -1
- package/build/lib/tools/process-commands.js +1 -1
- package/build/lib/tools/process-commands.js.map +1 -1
- package/build/lib/tools/system-calls.d.ts.map +1 -1
- package/build/lib/tools/system-calls.js +30 -36
- package/build/lib/tools/system-calls.js.map +1 -1
- package/build/lib/tools/types.d.ts +6 -6
- package/build/lib/tools/types.d.ts.map +1 -1
- package/build/lib/types.d.ts +1 -0
- package/build/lib/types.d.ts.map +1 -1
- package/lib/adb.ts +31 -25
- package/lib/helpers.ts +48 -36
- package/lib/logcat.ts +32 -22
- package/lib/logger.ts +1 -2
- package/lib/tools/aab-utils.js +42 -33
- package/lib/tools/android-manifest.js +78 -54
- package/lib/tools/apk-signing.ts +123 -89
- package/lib/tools/apk-utils.ts +206 -109
- package/lib/tools/apks-utils.js +50 -40
- package/lib/tools/app-commands.ts +220 -135
- package/lib/tools/device-settings.ts +154 -124
- package/lib/tools/emu-constants.ts +4 -5
- package/lib/tools/emulator-commands.ts +113 -65
- package/lib/tools/fs-commands.js +9 -8
- package/lib/tools/general-commands.js +48 -51
- package/lib/tools/keyboard-commands.js +22 -20
- package/lib/tools/lockmgmt.js +80 -51
- package/lib/tools/logcat-commands.js +6 -6
- package/lib/tools/network-commands.js +11 -12
- package/lib/tools/process-commands.ts +28 -15
- package/lib/tools/system-calls.ts +319 -221
- package/lib/tools/types.ts +19 -10
- package/lib/types.ts +1 -0
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apk-signing.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apk-signing.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAoC,gBAAgB,EAAE,YAAY,EAAC,MAAM,YAAY,CAAC;AAkBlG;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA8BjF;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB/E;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE9E;AAED;;;;;;;GAOG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBpE;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiC1E;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,OAAO,CAAC,CAsFlB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAgDtE;AAID;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAElE;AAED;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BjE"}
|
|
@@ -29,7 +29,7 @@ const SHA256 = 'sha256';
|
|
|
29
29
|
const SHA512 = 'sha512';
|
|
30
30
|
const MD5 = 'md5';
|
|
31
31
|
const DEFAULT_CERT_HASH = {
|
|
32
|
-
[SHA256]: 'a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc'
|
|
32
|
+
[SHA256]: 'a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc',
|
|
33
33
|
};
|
|
34
34
|
const JAVA_PROPS_INIT_ERROR = 'java.lang.Error: Properties init';
|
|
35
35
|
const SIGNED_APPS_CACHE = new lru_cache_1.LRUCache({
|
|
@@ -45,11 +45,7 @@ const SIGNED_APPS_CACHE = new lru_cache_1.LRUCache({
|
|
|
45
45
|
*/
|
|
46
46
|
async function executeApksigner(args) {
|
|
47
47
|
const apkSignerJar = await getApksignerForOs.bind(this)();
|
|
48
|
-
const fullCmd = [
|
|
49
|
-
await (0, helpers_js_1.getJavaForOs)(), '-Xmx1024M', '-Xss1m',
|
|
50
|
-
'-jar', apkSignerJar,
|
|
51
|
-
...args
|
|
52
|
-
];
|
|
48
|
+
const fullCmd = [await (0, helpers_js_1.getJavaForOs)(), '-Xmx1024M', '-Xss1m', '-jar', apkSignerJar, ...args];
|
|
53
49
|
logger_js_1.log.debug(`Starting apksigner: ${support_1.util.quote(fullCmd)}`);
|
|
54
50
|
// It is necessary to specify CWD explicitly; see https://github.com/appium/appium/issues/14724#issuecomment-737446715
|
|
55
51
|
const { stdout, stderr } = await (0, teen_process_1.exec)(fullCmd[0], fullCmd.slice(1), {
|
|
@@ -57,13 +53,17 @@ async function executeApksigner(args) {
|
|
|
57
53
|
// @ts-ignore This works
|
|
58
54
|
windowsVerbatimArguments: support_1.system.isWindows(),
|
|
59
55
|
});
|
|
60
|
-
for (const [name, stream] of [
|
|
56
|
+
for (const [name, stream] of [
|
|
57
|
+
['stdout', stdout],
|
|
58
|
+
['stderr', stderr],
|
|
59
|
+
]) {
|
|
61
60
|
if (!lodash_1.default.trim(stream)) {
|
|
62
61
|
continue;
|
|
63
62
|
}
|
|
64
63
|
if (name === 'stdout') {
|
|
65
64
|
// Make the output less talkative
|
|
66
|
-
const filteredStream = stream
|
|
65
|
+
const filteredStream = stream
|
|
66
|
+
.split('\n')
|
|
67
67
|
.filter((line) => !line.includes('WARNING:'))
|
|
68
68
|
.join('\n');
|
|
69
69
|
logger_js_1.log.debug(`apksigner ${name}: ${filteredStream}`);
|
|
@@ -87,8 +87,10 @@ async function signWithDefaultCert(apk) {
|
|
|
87
87
|
}
|
|
88
88
|
const args = [
|
|
89
89
|
'sign',
|
|
90
|
-
'--key',
|
|
91
|
-
|
|
90
|
+
'--key',
|
|
91
|
+
await (0, helpers_js_1.getResourcePath)(DEFAULT_PRIVATE_KEY),
|
|
92
|
+
'--cert',
|
|
93
|
+
await (0, helpers_js_1.getResourcePath)(DEFAULT_CERTIFICATE),
|
|
92
94
|
apk,
|
|
93
95
|
];
|
|
94
96
|
try {
|
|
@@ -115,12 +117,18 @@ async function signWithCustomCert(apk) {
|
|
|
115
117
|
throw new Error(`'${apk}' doesn't exist.`);
|
|
116
118
|
}
|
|
117
119
|
try {
|
|
118
|
-
await this.executeApksigner([
|
|
119
|
-
'
|
|
120
|
-
'--ks
|
|
121
|
-
|
|
122
|
-
'--key-
|
|
123
|
-
|
|
120
|
+
await this.executeApksigner([
|
|
121
|
+
'sign',
|
|
122
|
+
'--ks',
|
|
123
|
+
this.keystorePath,
|
|
124
|
+
'--ks-key-alias',
|
|
125
|
+
this.keyAlias,
|
|
126
|
+
'--ks-pass',
|
|
127
|
+
`pass:${this.keystorePassword}`,
|
|
128
|
+
'--key-pass',
|
|
129
|
+
`pass:${this.keyPassword}`,
|
|
130
|
+
apk,
|
|
131
|
+
]);
|
|
124
132
|
}
|
|
125
133
|
catch (err) {
|
|
126
134
|
const error = err;
|
|
@@ -134,13 +142,21 @@ async function signWithCustomCert(apk) {
|
|
|
134
142
|
logger_js_1.log.debug(`'${apk}' does not need to be unsigned`);
|
|
135
143
|
}
|
|
136
144
|
const jarsigner = path_1.default.resolve(await (0, helpers_js_1.getJavaHome)(), 'bin', `jarsigner${support_1.system.isWindows() ? '.exe' : ''}`);
|
|
137
|
-
const fullCmd = [
|
|
138
|
-
|
|
139
|
-
'-
|
|
140
|
-
'
|
|
141
|
-
'-
|
|
142
|
-
'
|
|
143
|
-
|
|
145
|
+
const fullCmd = [
|
|
146
|
+
jarsigner,
|
|
147
|
+
'-sigalg',
|
|
148
|
+
'MD5withRSA',
|
|
149
|
+
'-digestalg',
|
|
150
|
+
'SHA1',
|
|
151
|
+
'-keystore',
|
|
152
|
+
this.keystorePath,
|
|
153
|
+
'-storepass',
|
|
154
|
+
this.keystorePassword,
|
|
155
|
+
'-keypass',
|
|
156
|
+
this.keyPassword,
|
|
157
|
+
apk,
|
|
158
|
+
this.keyAlias,
|
|
159
|
+
];
|
|
144
160
|
logger_js_1.log.debug(`Starting jarsigner: ${support_1.util.quote(fullCmd)}`);
|
|
145
161
|
await (0, teen_process_1.exec)(fullCmd[0], fullCmd.slice(1), {
|
|
146
162
|
// @ts-ignore This works
|
|
@@ -166,12 +182,14 @@ async function sign(appPath) {
|
|
|
166
182
|
if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
|
|
167
183
|
let message = 'Signing of .apks-files is not supported. ';
|
|
168
184
|
if (this.useKeystore) {
|
|
169
|
-
message +=
|
|
170
|
-
|
|
185
|
+
message +=
|
|
186
|
+
'Consider manual application bundle signing with the custom keystore ' +
|
|
187
|
+
`like it is described at ${BUNDLETOOL_TUTORIAL}`;
|
|
171
188
|
}
|
|
172
189
|
else {
|
|
173
|
-
message +=
|
|
174
|
-
`
|
|
190
|
+
message +=
|
|
191
|
+
`Consider manual application bundle signing with the key at '${DEFAULT_PRIVATE_KEY}' ` +
|
|
192
|
+
`and the certificate at '${DEFAULT_CERTIFICATE}'. Read ${BUNDLETOOL_TUTORIAL} for more details.`;
|
|
175
193
|
}
|
|
176
194
|
logger_js_1.log.warn(message);
|
|
177
195
|
return;
|
|
@@ -237,7 +255,7 @@ async function zipAlignApk(apk) {
|
|
|
237
255
|
*/
|
|
238
256
|
async function checkApkCert(appPath, pkg, opts = {}) {
|
|
239
257
|
logger_js_1.log.debug(`Checking app cert for ${appPath}`);
|
|
240
|
-
if (!await support_1.fs.exists(appPath)) {
|
|
258
|
+
if (!(await support_1.fs.exists(appPath))) {
|
|
241
259
|
logger_js_1.log.debug(`'${appPath}' does not exist`);
|
|
242
260
|
return false;
|
|
243
261
|
}
|
|
@@ -254,14 +272,14 @@ async function checkApkCert(appPath, pkg, opts = {}) {
|
|
|
254
272
|
}
|
|
255
273
|
return false;
|
|
256
274
|
};
|
|
257
|
-
const { requireDefaultCert = true
|
|
275
|
+
const { requireDefaultCert = true } = opts;
|
|
258
276
|
const appHash = await support_1.fs.hash(actualAppPath);
|
|
259
277
|
if (SIGNED_APPS_CACHE.has(appHash)) {
|
|
260
278
|
logger_js_1.log.debug(`Using the previously cached signature entry for '${path_1.default.basename(actualAppPath)}'`);
|
|
261
279
|
const cached = SIGNED_APPS_CACHE.get(appHash);
|
|
262
280
|
if (cached) {
|
|
263
281
|
const { keystorePath, output, expected } = cached;
|
|
264
|
-
if (this.useKeystore && this.keystorePath === keystorePath || !this.useKeystore) {
|
|
282
|
+
if ((this.useKeystore && this.keystorePath === keystorePath) || !this.useKeystore) {
|
|
265
283
|
return (!this.useKeystore && !requireDefaultCert) || hashMatches(output, expected);
|
|
266
284
|
}
|
|
267
285
|
}
|
|
@@ -310,8 +328,7 @@ async function checkApkCert(appPath, pkg, opts = {}) {
|
|
|
310
328
|
logger_js_1.log.warn(`Assuming '${actualAppPath}' is already signed and continuing anyway`);
|
|
311
329
|
return true;
|
|
312
330
|
}
|
|
313
|
-
throw new Error(`Cannot verify the signature of '${actualAppPath}'. ` +
|
|
314
|
-
`Original error: ${errMsg}`);
|
|
331
|
+
throw new Error(`Cannot verify the signature of '${actualAppPath}'. ` + `Original error: ${errMsg}`);
|
|
315
332
|
}
|
|
316
333
|
}
|
|
317
334
|
/**
|
|
@@ -323,14 +340,18 @@ async function checkApkCert(appPath, pkg, opts = {}) {
|
|
|
323
340
|
async function getKeystoreHash() {
|
|
324
341
|
logger_js_1.log.debug(`Getting hash of the '${this.keystorePath}' keystore`);
|
|
325
342
|
const keytool = path_1.default.resolve(await (0, helpers_js_1.getJavaHome)(), 'bin', `keytool${support_1.system.isWindows() ? '.exe' : ''}`);
|
|
326
|
-
if (!await support_1.fs.exists(keytool)) {
|
|
343
|
+
if (!(await support_1.fs.exists(keytool))) {
|
|
327
344
|
throw new Error(`The keytool utility cannot be found at '${keytool}'`);
|
|
328
345
|
}
|
|
329
346
|
const args = [
|
|
330
|
-
'-v',
|
|
331
|
-
'-
|
|
332
|
-
'-
|
|
333
|
-
|
|
347
|
+
'-v',
|
|
348
|
+
'-list',
|
|
349
|
+
'-alias',
|
|
350
|
+
this.keyAlias,
|
|
351
|
+
'-keystore',
|
|
352
|
+
this.keystorePath,
|
|
353
|
+
'-storepass',
|
|
354
|
+
this.keystorePassword,
|
|
334
355
|
];
|
|
335
356
|
logger_js_1.log.info(`Running '${keytool}' with arguments: ${support_1.util.quote(args)}`);
|
|
336
357
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apk-signing.js","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apk-signing.js","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apk-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apk-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-utils.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,sBAAsB,EACtB,UAAU,EACV,OAAO,EACP,YAAY,EACZ,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,iCAAiC,CAAC;AAEhE;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,OAAO,CAAC,CA4BlB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,GAAG,EACT,eAAe,EAAE,MAAM,EACvB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAKf;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,MAAM,CAAC,CA8FjB;AAED;;;;;;GAMG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA2Gf;AAED;;;;;;;GAOG;AACH,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAAM,GAAG,IAAW,GACxB,OAAO,CAAC,YAAY,CAAC,CAgFvB;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAAM,GAAG,IAAW,EACzB,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,sBAAsB,CAAC,CAwEjC;AAED;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,OAAO,GAAE,MAAM,GAAG,IAAW,GAC5B,OAAO,CAAC,UAAU,CAAC,CAyFrB;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC,CAqBlF;AAyCD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,YAAY,CAoGvF;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,YAAY,CAoEtF"}
|
|
@@ -67,7 +67,7 @@ exports.REMOTE_CACHE_ROOT = '/data/local/tmp/appium_cache';
|
|
|
67
67
|
*/
|
|
68
68
|
async function uninstallApk(pkg, options = {}) {
|
|
69
69
|
logger_js_1.log.debug(`Uninstalling ${pkg}`);
|
|
70
|
-
if (!options.skipInstallCheck && !await this.isAppInstalled(pkg)) {
|
|
70
|
+
if (!options.skipInstallCheck && !(await this.isAppInstalled(pkg))) {
|
|
71
71
|
logger_js_1.log.info(`${pkg} was not uninstalled, because it was not present on the device`);
|
|
72
72
|
return false;
|
|
73
73
|
}
|
|
@@ -122,10 +122,12 @@ async function cacheApk(apkPath, options = {}) {
|
|
|
122
122
|
try {
|
|
123
123
|
const errorMarker = '_ERROR_';
|
|
124
124
|
let lsOutput = null;
|
|
125
|
-
if (this._areExtendedLsOptionsSupported === true ||
|
|
125
|
+
if (this._areExtendedLsOptionsSupported === true ||
|
|
126
|
+
!lodash_1.default.isBoolean(this._areExtendedLsOptionsSupported)) {
|
|
126
127
|
lsOutput = await this.shell([`ls -t -1 ${exports.REMOTE_CACHE_ROOT} 2>&1 || echo ${errorMarker}`]);
|
|
127
128
|
}
|
|
128
|
-
if (!lodash_1.default.isString(lsOutput) ||
|
|
129
|
+
if (!lodash_1.default.isString(lsOutput) ||
|
|
130
|
+
(lsOutput.includes(errorMarker) && !lsOutput.includes(exports.REMOTE_CACHE_ROOT))) {
|
|
129
131
|
if (!lodash_1.default.isBoolean(this._areExtendedLsOptionsSupported)) {
|
|
130
132
|
logger_js_1.log.debug('The current Android API does not support extended ls options. ' +
|
|
131
133
|
'Defaulting to no-options call');
|
|
@@ -139,9 +141,10 @@ async function cacheApk(apkPath, options = {}) {
|
|
|
139
141
|
if (lsOutput.includes(errorMarker)) {
|
|
140
142
|
throw new Error(lsOutput.substring(0, lsOutput.indexOf(errorMarker)));
|
|
141
143
|
}
|
|
142
|
-
remoteCachedFiles.push(...
|
|
144
|
+
remoteCachedFiles.push(...lsOutput
|
|
145
|
+
.split('\n')
|
|
143
146
|
.map((x) => x.trim())
|
|
144
|
-
.filter(Boolean))
|
|
147
|
+
.filter(Boolean));
|
|
145
148
|
}
|
|
146
149
|
catch (e) {
|
|
147
150
|
const err = e;
|
|
@@ -173,8 +176,7 @@ async function cacheApk(apkPath, options = {}) {
|
|
|
173
176
|
});
|
|
174
177
|
}
|
|
175
178
|
// Cleanup the invalid entries from the cache
|
|
176
|
-
lodash_1.default.difference([...this.remoteAppsCache.keys()], remoteCachedFiles.map(toHash))
|
|
177
|
-
.forEach((hash) => this.remoteAppsCache.delete(hash));
|
|
179
|
+
lodash_1.default.difference([...this.remoteAppsCache.keys()], remoteCachedFiles.map(toHash)).forEach((hash) => this.remoteAppsCache.delete(hash));
|
|
178
180
|
// Bump the cache record for the recently cached item
|
|
179
181
|
this.remoteAppsCache.set(appHash, remotePath);
|
|
180
182
|
// If the remote cache exceeds this.remoteAppsCacheLimit, remove the least recently used entries
|
|
@@ -213,7 +215,7 @@ async function install(appPath, options = {}) {
|
|
|
213
215
|
timeoutCapName: 'androidInstallTimeout',
|
|
214
216
|
});
|
|
215
217
|
const installArgs = (0, helpers_js_1.buildInstallArgs)(await this.getApiLevel(), options);
|
|
216
|
-
if (options.noIncremental && await this.isIncrementalInstallSupported()) {
|
|
218
|
+
if (options.noIncremental && (await this.isIncrementalInstallSupported())) {
|
|
217
219
|
// Adb throws an error if it does not know about an arg,
|
|
218
220
|
// which is the case here for older adb versions.
|
|
219
221
|
installArgs.push('--no-incremental');
|
|
@@ -222,11 +224,7 @@ async function install(appPath, options = {}) {
|
|
|
222
224
|
timeout: options.timeout,
|
|
223
225
|
timeoutCapName: options.timeoutCapName,
|
|
224
226
|
};
|
|
225
|
-
const installCmd = [
|
|
226
|
-
'install',
|
|
227
|
-
...installArgs,
|
|
228
|
-
appPath,
|
|
229
|
-
];
|
|
227
|
+
const installCmd = ['install', ...installArgs, appPath];
|
|
230
228
|
let performAppInstall = async () => await this.adbExec(installCmd, installOpts);
|
|
231
229
|
// this.remoteAppsCacheLimit <= 0 means no caching should be applied
|
|
232
230
|
let shouldCacheApp = this.remoteAppsCacheLimit > 0;
|
|
@@ -249,7 +247,8 @@ async function install(appPath, options = {}) {
|
|
|
249
247
|
const cachedAppPath = await cacheApp();
|
|
250
248
|
performAppInstall = async () => {
|
|
251
249
|
const pmInstallCmdByRemotePath = (remotePath) => [
|
|
252
|
-
'pm',
|
|
250
|
+
'pm',
|
|
251
|
+
'install',
|
|
253
252
|
...installArgs,
|
|
254
253
|
remotePath,
|
|
255
254
|
];
|
|
@@ -279,8 +278,9 @@ async function install(appPath, options = {}) {
|
|
|
279
278
|
const timer = new support_1.timing.Timer().start();
|
|
280
279
|
const output = await performAppInstall();
|
|
281
280
|
logger_js_1.log.info(`The installation of '${path_1.default.basename(appPath)}' took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
282
|
-
const truncatedOutput =
|
|
283
|
-
|
|
281
|
+
const truncatedOutput = !lodash_1.default.isString(output) || output.length <= 300
|
|
282
|
+
? output
|
|
283
|
+
: `${output.substring(0, 150)}...${output.substring(output.length - 150)}`;
|
|
284
284
|
logger_js_1.log.debug(`Install command stdout: ${truncatedOutput}`);
|
|
285
285
|
if (/\[INSTALL[A-Z_]+FAILED[A-Z_]+\]/.test(output)) {
|
|
286
286
|
if (this.isTestPackageOnlyError(output)) {
|
|
@@ -345,7 +345,9 @@ async function getApplicationInstallState(appPath, pkg = null) {
|
|
|
345
345
|
}
|
|
346
346
|
// Version codes might not be maintained. Check version names.
|
|
347
347
|
if (pkgVersionCode === apkVersionCode) {
|
|
348
|
-
if (lodash_1.default.isString(apkVersionName) &&
|
|
348
|
+
if (lodash_1.default.isString(apkVersionName) &&
|
|
349
|
+
lodash_1.default.isString(pkgVersionName) &&
|
|
350
|
+
semver.satisfies(pkgVersionName, `>=${apkVersionName}`)) {
|
|
349
351
|
logger_js_1.log.debug(`The version name of the installed '${pkg}' is greater or equal to the application version name ('${pkgVersionName}' >= '${apkVersionName}')`);
|
|
350
352
|
return semver.satisfies(pkgVersionName, `>${apkVersionName}`)
|
|
351
353
|
? this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED
|
|
@@ -357,7 +359,9 @@ async function getApplicationInstallState(appPath, pkg = null) {
|
|
|
357
359
|
}
|
|
358
360
|
}
|
|
359
361
|
}
|
|
360
|
-
else if (lodash_1.default.isString(apkVersionName) &&
|
|
362
|
+
else if (lodash_1.default.isString(apkVersionName) &&
|
|
363
|
+
lodash_1.default.isString(pkgVersionName) &&
|
|
364
|
+
semver.satisfies(pkgVersionName, `>=${apkVersionName}`)) {
|
|
361
365
|
logger_js_1.log.debug(`The version name of the installed '${pkg}' is greater or equal to the application version name ('${pkgVersionName}' >= '${apkVersionName}')`);
|
|
362
366
|
return semver.satisfies(pkgVersionName, `>${apkVersionName}`)
|
|
363
367
|
? this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED
|
|
@@ -387,11 +391,11 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
|
|
|
387
391
|
`Continuing with the install anyway`);
|
|
388
392
|
}
|
|
389
393
|
}
|
|
390
|
-
const { enforceCurrentBuild
|
|
394
|
+
const { enforceCurrentBuild } = options;
|
|
391
395
|
const appState = await this.getApplicationInstallState(appPath, pkg);
|
|
392
396
|
let wasUninstalled = false;
|
|
393
397
|
const uninstallPackage = async () => {
|
|
394
|
-
if (!await this.uninstallApk(pkg, { skipInstallCheck: true })) {
|
|
398
|
+
if (!(await this.uninstallApk(pkg, { skipInstallCheck: true }))) {
|
|
395
399
|
throw new Error(`'${pkg}' package cannot be uninstalled`);
|
|
396
400
|
}
|
|
397
401
|
wasUninstalled = true;
|
|
@@ -467,12 +471,17 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
|
|
|
467
471
|
await this.initAapt();
|
|
468
472
|
configMarker = await formatConfigMarker(async () => {
|
|
469
473
|
const { stdout } = await (0, teen_process_1.exec)(this.binaries.aapt, [
|
|
470
|
-
'd',
|
|
474
|
+
'd',
|
|
475
|
+
'configurations',
|
|
476
|
+
appPath,
|
|
471
477
|
]);
|
|
472
478
|
return lodash_1.default.uniq(stdout.split(os_1.default.EOL));
|
|
473
479
|
}, language, '(default)');
|
|
474
480
|
const { stdout } = await (0, teen_process_1.exec)(this.binaries.aapt, [
|
|
475
|
-
'd',
|
|
481
|
+
'd',
|
|
482
|
+
'--values',
|
|
483
|
+
'resources',
|
|
484
|
+
appPath,
|
|
476
485
|
]);
|
|
477
486
|
apkStrings = parseAaptStrings(stdout, configMarker);
|
|
478
487
|
}
|
|
@@ -483,20 +492,23 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
|
|
|
483
492
|
await this.initAapt2();
|
|
484
493
|
configMarker = await formatConfigMarker(async () => {
|
|
485
494
|
const { stdout } = await (0, teen_process_1.exec)(this.binaries.aapt2, [
|
|
486
|
-
'd',
|
|
495
|
+
'd',
|
|
496
|
+
'configurations',
|
|
497
|
+
appPath,
|
|
487
498
|
]);
|
|
488
499
|
return lodash_1.default.uniq(stdout.split(os_1.default.EOL));
|
|
489
500
|
}, language, '');
|
|
490
501
|
try {
|
|
491
502
|
const { stdout } = await (0, teen_process_1.exec)(this.binaries.aapt2, [
|
|
492
|
-
'd',
|
|
503
|
+
'd',
|
|
504
|
+
'resources',
|
|
505
|
+
appPath,
|
|
493
506
|
]);
|
|
494
507
|
apkStrings = parseAapt2Strings(stdout, configMarker);
|
|
495
508
|
}
|
|
496
509
|
catch (e) {
|
|
497
510
|
const error = e;
|
|
498
|
-
throw new Error(`Cannot extract resources from '${originalAppPath}'. ` +
|
|
499
|
-
`Original error: ${error.message}`);
|
|
511
|
+
throw new Error(`Cannot extract resources from '${originalAppPath}'. ` + `Original error: ${error.message}`);
|
|
500
512
|
}
|
|
501
513
|
}
|
|
502
514
|
if (lodash_1.default.isEmpty(apkStrings)) {
|
|
@@ -523,7 +535,7 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
|
|
|
523
535
|
* @returns The parsed application information.
|
|
524
536
|
*/
|
|
525
537
|
async function getApkInfo(appPath) {
|
|
526
|
-
if (!await support_1.fs.exists(appPath)) {
|
|
538
|
+
if (!(await support_1.fs.exists(appPath))) {
|
|
527
539
|
throw new Error(`The file at path ${appPath} does not exist or is not accessible`);
|
|
528
540
|
}
|
|
529
541
|
if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
|
|
@@ -562,8 +574,8 @@ async function formatConfigMarker(configsGetter, desiredMarker, defaultMarker) {
|
|
|
562
574
|
const configs = await configsGetter();
|
|
563
575
|
logger_js_1.log.debug(`Resource configurations: ${JSON.stringify(configs)}`);
|
|
564
576
|
// Assume the 'en' configuration is the default one
|
|
565
|
-
if (configMarker.toLowerCase().startsWith('en')
|
|
566
|
-
|
|
577
|
+
if (configMarker.toLowerCase().startsWith('en') &&
|
|
578
|
+
!configs.some((x) => x.trim() === configMarker)) {
|
|
567
579
|
logger_js_1.log.debug(`Resource configuration name '${configMarker}' is unknown. ` +
|
|
568
580
|
`Replacing it with '${defaultMarker}'`);
|
|
569
581
|
configMarker = defaultMarker;
|
|
@@ -597,15 +609,9 @@ function parseAapt2Strings(rawOutput, configMarker) {
|
|
|
597
609
|
if (terminationCharMatch) {
|
|
598
610
|
const terminationCharPos = terminationCharMatch.index;
|
|
599
611
|
if (startIdx === idx) {
|
|
600
|
-
return [
|
|
601
|
-
allLines[idx].substring(startCharPos + 1, terminationCharPos),
|
|
602
|
-
idx
|
|
603
|
-
];
|
|
612
|
+
return [allLines[idx].substring(startCharPos + 1, terminationCharPos), idx];
|
|
604
613
|
}
|
|
605
|
-
return [
|
|
606
|
-
`${result}\\n${lodash_1.default.trimStart(allLines[idx].substring(0, terminationCharPos))}`,
|
|
607
|
-
idx,
|
|
608
|
-
];
|
|
614
|
+
return [`${result}\\n${lodash_1.default.trimStart(allLines[idx].substring(0, terminationCharPos))}`, idx];
|
|
609
615
|
}
|
|
610
616
|
if (idx > startIdx) {
|
|
611
617
|
result += `\\n${lodash_1.default.trimStart(allLines[idx])}`;
|
|
@@ -667,7 +673,9 @@ function parseAapt2Strings(rawOutput, configMarker) {
|
|
|
667
673
|
lineIndex = idx;
|
|
668
674
|
if (lodash_1.default.isString(content)) {
|
|
669
675
|
apkStrings[currentResourceId] = [
|
|
670
|
-
...(Array.isArray(apkStrings[currentResourceId])
|
|
676
|
+
...(Array.isArray(apkStrings[currentResourceId])
|
|
677
|
+
? apkStrings[currentResourceId]
|
|
678
|
+
: []),
|
|
671
679
|
content,
|
|
672
680
|
];
|
|
673
681
|
}
|