appium-adb 14.3.0 → 14.3.2
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 +13 -0
- package/build/lib/helpers.d.ts +2 -2
- package/build/lib/helpers.d.ts.map +1 -1
- package/build/lib/helpers.js +5 -5
- package/build/lib/helpers.js.map +1 -1
- package/build/lib/index.d.ts +8 -0
- package/build/lib/index.d.ts.map +1 -0
- package/build/{index.js → lib/index.js} +4 -4
- package/build/lib/index.js.map +1 -0
- package/build/lib/tools/aab-utils.d.ts +2 -2
- package/build/lib/tools/aab-utils.d.ts.map +1 -1
- package/build/lib/tools/aab-utils.js +10 -10
- package/build/lib/tools/aab-utils.js.map +1 -1
- package/build/lib/tools/android-manifest.d.ts +2 -2
- package/build/lib/tools/android-manifest.d.ts.map +1 -1
- package/build/lib/tools/android-manifest.js +27 -27
- package/build/lib/tools/android-manifest.js.map +1 -1
- package/build/lib/tools/apk-signing.d.ts +2 -2
- package/build/lib/tools/apk-signing.d.ts.map +1 -1
- package/build/lib/tools/apk-signing.js +36 -44
- package/build/lib/tools/apk-signing.js.map +1 -1
- package/build/lib/tools/apk-utils.d.ts +2 -2
- package/build/lib/tools/apk-utils.d.ts.map +1 -1
- package/build/lib/tools/apk-utils.js +50 -50
- package/build/lib/tools/apk-utils.js.map +1 -1
- package/build/lib/tools/apks-utils.d.ts +2 -2
- package/build/lib/tools/apks-utils.d.ts.map +1 -1
- package/build/lib/tools/apks-utils.js +18 -18
- package/build/lib/tools/apks-utils.js.map +1 -1
- package/build/lib/tools/app-commands.d.ts +2 -2
- package/build/lib/tools/app-commands.d.ts.map +1 -1
- package/build/lib/tools/app-commands.js +36 -36
- package/build/lib/tools/app-commands.js.map +1 -1
- package/build/lib/tools/device-settings.d.ts +2 -2
- package/build/lib/tools/device-settings.d.ts.map +1 -1
- package/build/lib/tools/device-settings.js +15 -15
- package/build/lib/tools/device-settings.js.map +1 -1
- package/build/lib/tools/emulator-commands.d.ts +2 -2
- package/build/lib/tools/emulator-commands.d.ts.map +1 -1
- package/build/lib/tools/emulator-commands.js +7 -7
- package/build/lib/tools/emulator-commands.js.map +1 -1
- package/build/lib/tools/fs-commands.d.ts +1 -1
- package/build/lib/tools/fs-commands.d.ts.map +1 -1
- package/build/lib/tools/general-commands.d.ts +2 -2
- package/build/lib/tools/general-commands.d.ts.map +1 -1
- package/build/lib/tools/general-commands.js +7 -7
- package/build/lib/tools/general-commands.js.map +1 -1
- package/build/lib/tools/keyboard-commands.d.ts +2 -2
- package/build/lib/tools/keyboard-commands.d.ts.map +1 -1
- package/build/lib/tools/keyboard-commands.js +3 -3
- package/build/lib/tools/keyboard-commands.js.map +1 -1
- package/build/lib/tools/lockmgmt.d.ts +1 -1
- package/build/lib/tools/lockmgmt.d.ts.map +1 -1
- package/build/lib/tools/lockmgmt.js +8 -8
- package/build/lib/tools/lockmgmt.js.map +1 -1
- package/build/lib/tools/logcat-commands.d.ts +2 -2
- package/build/lib/tools/logcat-commands.d.ts.map +1 -1
- package/build/lib/tools/network-commands.d.ts +2 -2
- package/build/lib/tools/network-commands.d.ts.map +1 -1
- package/build/lib/tools/network-commands.js +10 -10
- package/build/lib/tools/network-commands.js.map +1 -1
- package/build/lib/tools/process-commands.d.ts +1 -1
- package/build/lib/tools/process-commands.d.ts.map +1 -1
- package/build/lib/tools/process-commands.js +10 -10
- package/build/lib/tools/process-commands.js.map +1 -1
- package/build/lib/tools/system-calls.d.ts +2 -2
- package/build/lib/tools/system-calls.d.ts.map +1 -1
- package/build/lib/tools/system-calls.js +72 -72
- package/build/lib/tools/system-calls.js.map +1 -1
- package/lib/helpers.ts +3 -3
- package/lib/index.ts +8 -0
- package/lib/tools/aab-utils.ts +4 -4
- package/lib/tools/android-manifest.ts +4 -4
- package/lib/tools/apk-signing.ts +6 -14
- package/lib/tools/apk-utils.ts +4 -4
- package/lib/tools/apks-utils.ts +4 -4
- package/lib/tools/app-commands.ts +3 -3
- package/lib/tools/device-settings.ts +3 -3
- package/lib/tools/emulator-commands.ts +3 -3
- package/lib/tools/fs-commands.ts +1 -1
- package/lib/tools/general-commands.ts +3 -3
- package/lib/tools/keyboard-commands.ts +3 -3
- package/lib/tools/lockmgmt.ts +2 -2
- package/lib/tools/logcat-commands.ts +2 -2
- package/lib/tools/network-commands.ts +3 -3
- package/lib/tools/process-commands.ts +2 -2
- package/lib/tools/system-calls.ts +4 -4
- package/package.json +4 -6
- package/build/index.d.ts +0 -8
- package/build/index.d.ts.map +0 -1
- package/build/index.js.map +0 -1
- package/index.ts +0 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
## [14.3.2](https://github.com/appium/appium-adb/compare/v14.3.1...v14.3.2) (2026-04-10)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* **deps-dev:** Bump typescript from 5.9.3 to 6.0.2 ([#866](https://github.com/appium/appium-adb/issues/866)) ([cd35032](https://github.com/appium/appium-adb/commit/cd350321b5a75612d35f5367f76675e175fb69a5))
|
|
6
|
+
* **deps:** Bump android-actions/setup-android from 3 to 4 ([#869](https://github.com/appium/appium-adb/issues/869)) ([f454e28](https://github.com/appium/appium-adb/commit/f454e28e5ae971e094d8e0747914d7d805ee4a47))
|
|
7
|
+
|
|
8
|
+
## [14.3.1](https://github.com/appium/appium-adb/compare/v14.3.0...v14.3.1) (2026-03-31)
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
|
|
12
|
+
* Windows APK signature verification when Java/SDK paths contain spaces ([#868](https://github.com/appium/appium-adb/issues/868)) ([ca8b31e](https://github.com/appium/appium-adb/commit/ca8b31e4d92c9c1f0079241f8bed0424a48dd37a))
|
|
13
|
+
|
|
1
14
|
## [14.3.0](https://github.com/appium/appium-adb/compare/v14.2.2...v14.3.0) (2026-02-18)
|
|
2
15
|
|
|
3
16
|
### Features
|
package/build/lib/helpers.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
|
-
import type { ADB } from './adb
|
|
3
|
-
import type { ApkManifest } from './tools/types
|
|
2
|
+
import type { ADB } from './adb';
|
|
3
|
+
import type { ApkManifest } from './tools/types';
|
|
4
4
|
export declare const APKS_EXTENSION = ".apks";
|
|
5
5
|
export declare const APK_EXTENSION = ".apk";
|
|
6
6
|
export declare const APK_INSTALL_TIMEOUT = 60000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAM/C,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AACzC,eAAO,MAAM,wBAAwB,QAAQ,CAAC;AAK9C;;GAEG;AACH,eAAO,MAAM,eAAe,aACjB,MAAM,KACd,OAAO,CAAC,MAAM,CAAC,sBAUhB,CAAC;AAEH;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBtF;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,MAA8B,GACtC,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,eAAO,MAAM,WAAW,SAA2C,OAAO,CAAC,MAAM,CAAC,sBAahF,CAAC;AAEH,eAAO,MAAM,YAAY,SAA4C,OAAO,CAAC,MAAM,CAAC,sBAyBlF,CAAC;AAEH;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,uBAA4B,GACpC,MAAM,EAAE,CA6BV;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAgH1F;AAmCD;;GAEG;AACH,UAAU,uBAAuB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B"}
|
package/build/lib/helpers.js
CHANGED
|
@@ -11,7 +11,7 @@ exports.buildInstallArgs = buildInstallArgs;
|
|
|
11
11
|
exports.readPackageManifest = readPackageManifest;
|
|
12
12
|
const node_path_1 = __importDefault(require("node:path"));
|
|
13
13
|
const support_1 = require("@appium/support");
|
|
14
|
-
const
|
|
14
|
+
const logger_1 = require("./logger");
|
|
15
15
|
const lodash_1 = __importDefault(require("lodash"));
|
|
16
16
|
const teen_process_1 = require("teen_process");
|
|
17
17
|
// Constants
|
|
@@ -62,10 +62,10 @@ async function requireSdkRoot(customRoot = null) {
|
|
|
62
62
|
* @param dstRoot
|
|
63
63
|
*/
|
|
64
64
|
async function unzipFile(zipPath, dstRoot = node_path_1.default.dirname(zipPath)) {
|
|
65
|
-
|
|
65
|
+
logger_1.log.debug(`Unzipping '${zipPath}' to '${dstRoot}'`);
|
|
66
66
|
await support_1.zip.assertValidZip(zipPath);
|
|
67
67
|
await support_1.zip.extractAllTo(zipPath, dstRoot);
|
|
68
|
-
|
|
68
|
+
logger_1.log.debug('Unzip successful');
|
|
69
69
|
}
|
|
70
70
|
exports.getJavaHome = lodash_1.default.memoize(async function getJavaHome() {
|
|
71
71
|
const result = process.env.JAVA_HOME;
|
|
@@ -123,7 +123,7 @@ function buildInstallArgs(apiLevel, options = {}) {
|
|
|
123
123
|
}
|
|
124
124
|
if (options.grantPermissions) {
|
|
125
125
|
if (apiLevel < 23) {
|
|
126
|
-
|
|
126
|
+
logger_1.log.debug(`Skipping permissions grant option, since ` +
|
|
127
127
|
`the current API level ${apiLevel} does not support applications ` +
|
|
128
128
|
`permissions customization`);
|
|
129
129
|
}
|
|
@@ -148,7 +148,7 @@ async function readPackageManifest(apkPath) {
|
|
|
148
148
|
throw new Error('aapt2 binary is not available');
|
|
149
149
|
}
|
|
150
150
|
const args = ['dump', 'badging', apkPath];
|
|
151
|
-
|
|
151
|
+
logger_1.log.debug(`Reading package manifest: '${support_1.util.quote([aapt2Binary, ...args])}'`);
|
|
152
152
|
let stdout;
|
|
153
153
|
try {
|
|
154
154
|
({ stdout } = await (0, teen_process_1.exec)(aapt2Binary, args));
|
package/build/lib/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":";;;;;;AAwCA,8CAEC;AAKD,wCAoBC;AAMD,8BAQC;AA+CD,4CAgCC;AAMD,kDAgHC;AAtRD,0DAA6B;AAC7B,6CAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export * from './adb';
|
|
2
|
+
export { getAndroidBinaryPath } from './tools/system-calls';
|
|
3
|
+
export { getSdkRootFromEnv } from './helpers';
|
|
4
|
+
export type * from './tools/types';
|
|
5
|
+
export type * from './types';
|
|
6
|
+
import { ADB } from './adb';
|
|
7
|
+
export default ADB;
|
|
8
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,mBAAmB,eAAe,CAAC;AACnC,mBAAmB,SAAS,CAAC;AAE7B,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAC1B,eAAe,GAAG,CAAC"}
|
|
@@ -15,11 +15,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.getSdkRootFromEnv = exports.getAndroidBinaryPath = void 0;
|
|
18
|
-
__exportStar(require("./
|
|
19
|
-
var system_calls_1 = require("./
|
|
18
|
+
__exportStar(require("./adb"), exports);
|
|
19
|
+
var system_calls_1 = require("./tools/system-calls");
|
|
20
20
|
Object.defineProperty(exports, "getAndroidBinaryPath", { enumerable: true, get: function () { return system_calls_1.getAndroidBinaryPath; } });
|
|
21
|
-
var helpers_1 = require("./
|
|
21
|
+
var helpers_1 = require("./helpers");
|
|
22
22
|
Object.defineProperty(exports, "getSdkRootFromEnv", { enumerable: true, get: function () { return helpers_1.getSdkRootFromEnv; } });
|
|
23
|
-
const adb_1 = require("./
|
|
23
|
+
const adb_1 = require("./adb");
|
|
24
24
|
exports.default = adb_1.ADB;
|
|
25
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,qDAA0D;AAAlD,oHAAA,oBAAoB,OAAA;AAC5B,qCAA4C;AAApC,4GAAA,iBAAiB,OAAA;AAIzB,+BAA0B;AAC1B,kBAAe,SAAG,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ADB } from '../adb
|
|
2
|
-
import type { ApkCreationOptions } from './types
|
|
1
|
+
import type { ADB } from '../adb';
|
|
2
|
+
import type { ApkCreationOptions } from './types';
|
|
3
3
|
/**
|
|
4
4
|
* Builds a universal .apk from the given .aab package. See
|
|
5
5
|
* https://developer.android.com/studio/command-line/bundletool#generate_apks
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aab-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"aab-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAC,kBAAkB,EAAe,MAAM,SAAS,CAAC;AA4B9D;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,kBAAuB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAuGjB"}
|
|
@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.extractUniversalApk = extractUniversalApk;
|
|
7
|
-
const
|
|
7
|
+
const logger_1 = require("../logger");
|
|
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");
|
|
11
|
-
const
|
|
11
|
+
const helpers_1 = require("../helpers");
|
|
12
12
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
13
13
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
14
14
|
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
@@ -23,14 +23,14 @@ process.on('exit', () => {
|
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
25
|
const paths = [...AAB_CACHE.values()];
|
|
26
|
-
|
|
26
|
+
logger_1.log.debug(`Performing cleanup of ${paths.length} cached .aab ` + support_1.util.pluralize('package', paths.length));
|
|
27
27
|
for (const appPath of paths) {
|
|
28
28
|
try {
|
|
29
29
|
// Asynchronous calls are not supported in onExit handler
|
|
30
30
|
support_1.fs.rimrafSync(appPath);
|
|
31
31
|
}
|
|
32
32
|
catch (e) {
|
|
33
|
-
|
|
33
|
+
logger_1.log.warn(e.message);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
});
|
|
@@ -71,7 +71,7 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
71
71
|
keyAliasHash.update(keyAlias);
|
|
72
72
|
cacheHash = [cacheHash, keystoreHash, keyAliasHash.digest('hex')].join(':');
|
|
73
73
|
}
|
|
74
|
-
|
|
74
|
+
logger_1.log.debug(`Calculated the cache key for '${aabPath}': ${cacheHash}`);
|
|
75
75
|
if (AAB_CACHE.has(cacheHash)) {
|
|
76
76
|
const cachedRoot = AAB_CACHE.get(cacheHash);
|
|
77
77
|
if (cachedRoot) {
|
|
@@ -106,10 +106,10 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
106
106
|
: []),
|
|
107
107
|
'--mode=universal',
|
|
108
108
|
];
|
|
109
|
-
|
|
109
|
+
logger_1.log.debug(`Preparing universal .apks bundle from '${aabPath}'`);
|
|
110
110
|
await this.execBundletool(args, `Cannot build a universal .apks bundle from '${aabPath}'`);
|
|
111
|
-
|
|
112
|
-
await (0,
|
|
111
|
+
logger_1.log.debug(`Unpacking universal application bundle at '${tmpApksPath}' to '${tmpRoot}'`);
|
|
112
|
+
await (0, helpers_1.unzipFile)(tmpApksPath, tmpRoot);
|
|
113
113
|
let universalApkPath;
|
|
114
114
|
const fileDeletionPromises = [];
|
|
115
115
|
const allFileNames = await support_1.fs.readdir(tmpRoot);
|
|
@@ -127,12 +127,12 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
127
127
|
}
|
|
128
128
|
catch { }
|
|
129
129
|
if (!universalApkPath) {
|
|
130
|
-
|
|
130
|
+
logger_1.log.debug(`The following items were extracted from the .aab bundle: ${allFileNames}`);
|
|
131
131
|
throw new Error(`${UNIVERSAL_APK} cannot be found in '${aabPath}' bundle. ` +
|
|
132
132
|
`Does the archive contain a valid application bundle?`);
|
|
133
133
|
}
|
|
134
134
|
const resultPath = node_path_1.default.join(tmpRoot, apkName);
|
|
135
|
-
|
|
135
|
+
logger_1.log.debug(`Found ${UNIVERSAL_APK} at '${universalApkPath}'. Caching it to '${resultPath}'`);
|
|
136
136
|
await support_1.fs.mv(universalApkPath, resultPath);
|
|
137
137
|
AAB_CACHE.set(cacheHash, tmpRoot);
|
|
138
138
|
return resultPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":";;;;;AAgDA,kDA2GC;AA3JD,
|
|
1
|
+
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ADB } from '../adb
|
|
2
|
-
import type { APKInfo, PlatformInfo } from './types
|
|
1
|
+
import type { ADB } from '../adb';
|
|
2
|
+
import type { APKInfo, PlatformInfo } from './types';
|
|
3
3
|
/**
|
|
4
4
|
* Extract package and main activity name from application manifest.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-manifest.d.ts","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"android-manifest.d.ts","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAC,OAAO,EAAE,YAAY,EAAe,MAAM,SAAS,CAAC;AAEjE;;;;;;;GAOG;AACH,wBAAsB,oCAAoC,CACxD,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC,CAYlB;AAED;;;;;;;GAOG;AACH,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAe9F;AAED;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,MAAM,GAAG,IAAW,GAC9B,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CA+Df;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED;;;;;GAKG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC,CAQlB;AAID;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAmCtF"}
|
|
@@ -12,8 +12,8 @@ exports.hasInternetPermissionFromManifest = hasInternetPermissionFromManifest;
|
|
|
12
12
|
exports.getAndroidPlatformAndPath = getAndroidPlatformAndPath;
|
|
13
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
14
|
const teen_process_1 = require("teen_process");
|
|
15
|
-
const
|
|
16
|
-
const
|
|
15
|
+
const logger_1 = require("../logger");
|
|
16
|
+
const helpers_1 = require("../helpers");
|
|
17
17
|
const support_1 = require("@appium/support");
|
|
18
18
|
const node_path_1 = __importDefault(require("node:path"));
|
|
19
19
|
/**
|
|
@@ -25,12 +25,12 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
25
25
|
* application package.
|
|
26
26
|
*/
|
|
27
27
|
async function packageAndLaunchActivityFromManifest(appPath) {
|
|
28
|
-
if (appPath.endsWith(
|
|
28
|
+
if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
|
|
29
29
|
appPath = await this.extractBaseApk(appPath);
|
|
30
30
|
}
|
|
31
|
-
const { name: apkPackage, launchableActivity: { name: apkActivity }, } = await
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
const { name: apkPackage, launchableActivity: { name: apkActivity }, } = await helpers_1.readPackageManifest.bind(this)(appPath);
|
|
32
|
+
logger_1.log.info(`Package name: '${apkPackage}'`);
|
|
33
|
+
logger_1.log.info(`Main activity name: '${apkActivity}'`);
|
|
34
34
|
return { apkPackage, apkActivity };
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
@@ -42,12 +42,12 @@ async function packageAndLaunchActivityFromManifest(appPath) {
|
|
|
42
42
|
* application package.
|
|
43
43
|
*/
|
|
44
44
|
async function targetSdkVersionFromManifest(appPath) {
|
|
45
|
-
|
|
45
|
+
logger_1.log.debug(`Extracting target SDK version of '${appPath}'`);
|
|
46
46
|
const originalAppPath = appPath;
|
|
47
|
-
if (appPath.endsWith(
|
|
47
|
+
if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
|
|
48
48
|
appPath = await this.extractBaseApk(appPath);
|
|
49
49
|
}
|
|
50
|
-
const { targetSdkVersion } = await
|
|
50
|
+
const { targetSdkVersion } = await helpers_1.readPackageManifest.bind(this)(appPath);
|
|
51
51
|
if (!targetSdkVersion) {
|
|
52
52
|
throw new Error(`Cannot extract targetSdkVersion of '${originalAppPath}'. Does ` +
|
|
53
53
|
`the package manifest define it?`);
|
|
@@ -106,11 +106,11 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
106
106
|
androidJarPath,
|
|
107
107
|
'-v',
|
|
108
108
|
];
|
|
109
|
-
|
|
109
|
+
logger_1.log.debug(`Compiling the manifest using '${support_1.util.quote([binaries.aapt2, ...args])}'`);
|
|
110
110
|
await (0, teen_process_1.exec)(binaries.aapt2, args);
|
|
111
111
|
}
|
|
112
112
|
catch (e) {
|
|
113
|
-
|
|
113
|
+
logger_1.log.debug('Cannot compile the manifest using aapt2. Defaulting to aapt. ' +
|
|
114
114
|
`Original error: ${e.message || e.stderr}`);
|
|
115
115
|
await this.initAapt();
|
|
116
116
|
const binaries = this.binaries;
|
|
@@ -128,7 +128,7 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
128
128
|
resultPath,
|
|
129
129
|
'-f',
|
|
130
130
|
];
|
|
131
|
-
|
|
131
|
+
logger_1.log.debug(`Compiling the manifest using '${support_1.util.quote([binaries.aapt, ...args])}'`);
|
|
132
132
|
try {
|
|
133
133
|
await (0, teen_process_1.exec)(binaries.aapt, args);
|
|
134
134
|
}
|
|
@@ -136,7 +136,7 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
136
136
|
throw new Error(`Cannot compile the manifest. Original error: ${e1.message || e1.stderr}`);
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
-
|
|
139
|
+
logger_1.log.debug(`Compiled the manifest at '${resultPath}'`);
|
|
140
140
|
}
|
|
141
141
|
/**
|
|
142
142
|
* Replace/insert the specially precompiled manifest file into the
|
|
@@ -152,15 +152,15 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
152
152
|
* The file will be overridden if it already exists.
|
|
153
153
|
*/
|
|
154
154
|
async function insertManifest(manifest, srcApk, dstApk) {
|
|
155
|
-
|
|
155
|
+
logger_1.log.debug(`Inserting manifest '${manifest}', src: '${srcApk}', dst: '${dstApk}'`);
|
|
156
156
|
await support_1.zip.assertValidZip(srcApk);
|
|
157
|
-
await (0,
|
|
157
|
+
await (0, helpers_1.unzipFile)(`${manifest}.apk`);
|
|
158
158
|
const manifestName = node_path_1.default.basename(manifest);
|
|
159
159
|
try {
|
|
160
160
|
await this.initAapt();
|
|
161
161
|
const binaries = this.binaries;
|
|
162
162
|
await support_1.fs.copyFile(srcApk, dstApk);
|
|
163
|
-
|
|
163
|
+
logger_1.log.debug('Moving manifest');
|
|
164
164
|
try {
|
|
165
165
|
await (0, teen_process_1.exec)(binaries.aapt, ['remove', dstApk, manifestName]);
|
|
166
166
|
}
|
|
@@ -170,18 +170,18 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
170
170
|
});
|
|
171
171
|
}
|
|
172
172
|
catch (e) {
|
|
173
|
-
|
|
173
|
+
logger_1.log.debug('Cannot insert manifest using aapt. Defaulting to zip. ' +
|
|
174
174
|
`Original error: ${e.message || e.stderr}`);
|
|
175
175
|
const tmpRoot = await support_1.tempDir.openDir();
|
|
176
176
|
try {
|
|
177
177
|
// Unfortunately NodeJS does not provide any reliable methods
|
|
178
178
|
// to replace files inside zip archives without loading the
|
|
179
179
|
// whole archive content into RAM
|
|
180
|
-
|
|
180
|
+
logger_1.log.debug(`Extracting the source apk at '${srcApk}'`);
|
|
181
181
|
await support_1.zip.extractAllTo(srcApk, tmpRoot);
|
|
182
|
-
|
|
182
|
+
logger_1.log.debug('Moving manifest');
|
|
183
183
|
await support_1.fs.mv(manifest, node_path_1.default.resolve(tmpRoot, manifestName));
|
|
184
|
-
|
|
184
|
+
logger_1.log.debug(`Collecting the destination apk at '${dstApk}'`);
|
|
185
185
|
await support_1.zip.toArchive(dstApk, {
|
|
186
186
|
cwd: tmpRoot,
|
|
187
187
|
});
|
|
@@ -190,7 +190,7 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
190
190
|
await support_1.fs.rimraf(tmpRoot);
|
|
191
191
|
}
|
|
192
192
|
}
|
|
193
|
-
|
|
193
|
+
logger_1.log.debug(`Manifest insertion into '${dstApk}' is completed`);
|
|
194
194
|
}
|
|
195
195
|
/**
|
|
196
196
|
* Check whether package manifest contains Internet permissions.
|
|
@@ -199,11 +199,11 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
199
199
|
* @return True if the manifest requires Internet access permission.
|
|
200
200
|
*/
|
|
201
201
|
async function hasInternetPermissionFromManifest(appPath) {
|
|
202
|
-
|
|
203
|
-
if (appPath.endsWith(
|
|
202
|
+
logger_1.log.debug(`Checking if '${appPath}' requires internet access permission in the manifest`);
|
|
203
|
+
if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
|
|
204
204
|
appPath = await this.extractBaseApk(appPath);
|
|
205
205
|
}
|
|
206
|
-
const { usesPermissions } = await
|
|
206
|
+
const { usesPermissions } = await helpers_1.readPackageManifest.bind(this)(appPath);
|
|
207
207
|
return usesPermissions.some((name) => name === 'android.permission.INTERNET');
|
|
208
208
|
}
|
|
209
209
|
// #region Private functions
|
|
@@ -225,7 +225,7 @@ async function getAndroidPlatformAndPath(sdkRoot) {
|
|
|
225
225
|
const platform = node_path_1.default.basename(platformPath);
|
|
226
226
|
const match = /ro\.build\.version\.sdk=(\d+)/.exec(propsContent);
|
|
227
227
|
if (!match) {
|
|
228
|
-
|
|
228
|
+
logger_1.log.warn(`Cannot read the SDK version from '${propsPath}'. Skipping '${platform}'`);
|
|
229
229
|
continue;
|
|
230
230
|
}
|
|
231
231
|
platformsMapping[parseInt(match[1], 10)] = {
|
|
@@ -234,7 +234,7 @@ async function getAndroidPlatformAndPath(sdkRoot) {
|
|
|
234
234
|
};
|
|
235
235
|
}
|
|
236
236
|
if (lodash_1.default.isEmpty(platformsMapping)) {
|
|
237
|
-
|
|
237
|
+
logger_1.log.warn(`Found zero platform folders at '${node_path_1.default.resolve(sdkRoot, 'platforms')}'. ` +
|
|
238
238
|
`Do you have any Android SDKs installed?`);
|
|
239
239
|
return {
|
|
240
240
|
platform: null,
|
|
@@ -243,7 +243,7 @@ async function getAndroidPlatformAndPath(sdkRoot) {
|
|
|
243
243
|
}
|
|
244
244
|
const recentSdkVersion = lodash_1.default.keys(platformsMapping).sort().reverse()[0];
|
|
245
245
|
const result = platformsMapping[recentSdkVersion];
|
|
246
|
-
|
|
246
|
+
logger_1.log.debug(`Found the most recent Android platform: ${JSON.stringify(result)}`);
|
|
247
247
|
return result;
|
|
248
248
|
}
|
|
249
249
|
// #endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":";;;;;AAiBA,oFAeC;AAUD,oEAeC;AAUD,4DAUC;AAWD,0CAoEC;AAeD,wCA4CC;AAQD,8EAWC;AAUD,8DAmCC;AAvRD,oDAAuB;AACvB,+CAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ADB } from '../adb
|
|
2
|
-
import type { CertCheckOptions, KeystoreHash } from './types
|
|
1
|
+
import type { ADB } from '../adb';
|
|
2
|
+
import type { CertCheckOptions, KeystoreHash } from './types';
|
|
3
3
|
/**
|
|
4
4
|
* Execute apksigner utility with given arguments.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apk-signing.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"apk-signing.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAoC,gBAAgB,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAkB/F;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BjF;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,CAgE9E;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,CA6CtE;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"}
|