appium-adb 14.1.9 → 14.1.11
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/helpers.js +8 -8
- package/build/lib/helpers.js.map +1 -1
- package/build/lib/tools/aab-utils.js +9 -9
- package/build/lib/tools/aab-utils.js.map +1 -1
- package/build/lib/tools/android-manifest.js +9 -9
- package/build/lib/tools/android-manifest.js.map +1 -1
- package/build/lib/tools/apk-signing.js +16 -16
- package/build/lib/tools/apk-signing.js.map +1 -1
- package/build/lib/tools/apk-utils.js +12 -12
- package/build/lib/tools/apk-utils.js.map +1 -1
- package/build/lib/tools/apks-utils.js +5 -5
- package/build/lib/tools/apks-utils.js.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.js +2 -2
- package/build/lib/tools/fs-commands.js.map +1 -1
- package/build/lib/tools/network-commands.js +3 -3
- package/build/lib/tools/network-commands.js.map +1 -1
- package/build/lib/tools/system-calls.js +14 -14
- package/build/lib/tools/system-calls.js.map +1 -1
- package/lib/helpers.ts +1 -1
- package/lib/tools/aab-utils.ts +2 -2
- package/lib/tools/android-manifest.ts +1 -1
- package/lib/tools/apk-signing.ts +2 -2
- package/lib/tools/apk-utils.ts +2 -2
- package/lib/tools/apks-utils.ts +1 -1
- package/lib/tools/emulator-commands.ts +2 -2
- package/lib/tools/fs-commands.ts +1 -1
- package/lib/tools/network-commands.ts +1 -1
- package/lib/tools/system-calls.ts +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [14.1.11](https://github.com/appium/appium-adb/compare/v14.1.10...v14.1.11) (2026-01-28)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* **deps-dev:** Bump @appium/eslint-config-appium-ts from 2.0.5 to 3.0.0 ([#861](https://github.com/appium/appium-adb/issues/861)) ([1457220](https://github.com/appium/appium-adb/commit/14572205fbc7c6f3272d91fb5e9e4213aee4341d))
|
|
6
|
+
|
|
7
|
+
## [14.1.10](https://github.com/appium/appium-adb/compare/v14.1.9...v14.1.10) (2026-01-27)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* **deps:** Bump asyncbox from 4.1.1 to 6.0.1 ([#860](https://github.com/appium/appium-adb/issues/860)) ([7d83bfe](https://github.com/appium/appium-adb/commit/7d83bfeb64f4b20db7a267ca2546b65d60a9b0e9))
|
|
12
|
+
|
|
1
13
|
## [14.1.9](https://github.com/appium/appium-adb/compare/v14.1.8...v14.1.9) (2026-01-19)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
package/build/lib/helpers.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.requireSdkRoot = requireSdkRoot;
|
|
|
9
9
|
exports.unzipFile = unzipFile;
|
|
10
10
|
exports.buildInstallArgs = buildInstallArgs;
|
|
11
11
|
exports.readPackageManifest = readPackageManifest;
|
|
12
|
-
const
|
|
12
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
13
13
|
const support_1 = require("@appium/support");
|
|
14
14
|
const logger_js_1 = require("./logger.js");
|
|
15
15
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -26,7 +26,7 @@ const MODULE_NAME = 'appium-adb';
|
|
|
26
26
|
*/
|
|
27
27
|
exports.getResourcePath = lodash_1.default.memoize(async function getResourcePath(relPath) {
|
|
28
28
|
const moduleRoot = await getModuleRoot();
|
|
29
|
-
const resultPath =
|
|
29
|
+
const resultPath = node_path_1.default.resolve(moduleRoot, relPath);
|
|
30
30
|
if (!(await support_1.fs.exists(resultPath))) {
|
|
31
31
|
throw new Error(`Cannot find the resource '${relPath}' under the '${moduleRoot}' ` +
|
|
32
32
|
`folder of ${MODULE_NAME} Node.js module`);
|
|
@@ -61,7 +61,7 @@ async function requireSdkRoot(customRoot = null) {
|
|
|
61
61
|
* @param zipPath
|
|
62
62
|
* @param dstRoot
|
|
63
63
|
*/
|
|
64
|
-
async function unzipFile(zipPath, dstRoot =
|
|
64
|
+
async function unzipFile(zipPath, dstRoot = node_path_1.default.dirname(zipPath)) {
|
|
65
65
|
logger_js_1.log.debug(`Unzipping '${zipPath}' to '${dstRoot}'`);
|
|
66
66
|
await support_1.zip.assertValidZip(zipPath);
|
|
67
67
|
await support_1.zip.extractAllTo(zipPath, dstRoot);
|
|
@@ -93,7 +93,7 @@ exports.getJavaForOs = lodash_1.default.memoize(async function getJavaForOs() {
|
|
|
93
93
|
}
|
|
94
94
|
const executableName = `java${support_1.system.isWindows() ? '.exe' : ''}`;
|
|
95
95
|
if (javaHome) {
|
|
96
|
-
const resultPath =
|
|
96
|
+
const resultPath = node_path_1.default.resolve(javaHome, 'bin', executableName);
|
|
97
97
|
if (await support_1.fs.exists(resultPath)) {
|
|
98
98
|
return resultPath;
|
|
99
99
|
}
|
|
@@ -105,7 +105,7 @@ exports.getJavaForOs = lodash_1.default.memoize(async function getJavaForOs() {
|
|
|
105
105
|
// Ignore and throw custom error below
|
|
106
106
|
}
|
|
107
107
|
throw new Error(`The '${executableName}' binary could not be found ` +
|
|
108
|
-
`neither in PATH nor under JAVA_HOME (${javaHome ?
|
|
108
|
+
`neither in PATH nor under JAVA_HOME (${javaHome ? node_path_1.default.resolve(javaHome, 'bin') : errMsg})`);
|
|
109
109
|
});
|
|
110
110
|
/**
|
|
111
111
|
* Transforms given options into the list of `adb install.install-multiple` command arguments
|
|
@@ -255,10 +255,10 @@ async function readPackageManifest(apkPath) {
|
|
|
255
255
|
* Calculates the absolute path to the current module's root folder
|
|
256
256
|
*/
|
|
257
257
|
const getModuleRoot = lodash_1.default.memoize(async function getModuleRoot() {
|
|
258
|
-
let moduleRoot =
|
|
258
|
+
let moduleRoot = node_path_1.default.dirname(node_path_1.default.resolve(__filename));
|
|
259
259
|
let isAtFsRoot = false;
|
|
260
260
|
while (!isAtFsRoot) {
|
|
261
|
-
const manifestPath =
|
|
261
|
+
const manifestPath = node_path_1.default.join(moduleRoot, 'package.json');
|
|
262
262
|
try {
|
|
263
263
|
if (await support_1.fs.exists(manifestPath)) {
|
|
264
264
|
const manifestContent = await support_1.fs.readFile(manifestPath, 'utf8');
|
|
@@ -271,7 +271,7 @@ const getModuleRoot = lodash_1.default.memoize(async function getModuleRoot() {
|
|
|
271
271
|
catch {
|
|
272
272
|
// Ignore errors and continue searching
|
|
273
273
|
}
|
|
274
|
-
const parentDir =
|
|
274
|
+
const parentDir = node_path_1.default.dirname(moduleRoot);
|
|
275
275
|
isAtFsRoot = moduleRoot.length <= parentDir.length;
|
|
276
276
|
moduleRoot = parentDir;
|
|
277
277
|
}
|
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,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../lib/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.extractUniversalApk = extractUniversalApk;
|
|
7
7
|
const logger_js_1 = require("../logger.js");
|
|
8
|
-
const
|
|
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
11
|
const helpers_js_1 = require("../helpers.js");
|
|
12
12
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
13
13
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
14
|
-
const
|
|
14
|
+
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
15
15
|
const AAB_CACHE = new lru_cache_1.LRUCache({
|
|
16
16
|
max: 10,
|
|
17
17
|
dispose: (extractedFilesRoot) => support_1.fs.rimraf(extractedFilesRoot),
|
|
@@ -49,10 +49,10 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
49
49
|
if (!(await support_1.fs.exists(aabPath))) {
|
|
50
50
|
throw new Error(`The file at '${aabPath}' either does not exist or is not accessible`);
|
|
51
51
|
}
|
|
52
|
-
const aabName =
|
|
53
|
-
const apkName = aabName.substring(0, aabName.length -
|
|
52
|
+
const aabName = node_path_1.default.basename(aabPath);
|
|
53
|
+
const apkName = aabName.substring(0, aabName.length - node_path_1.default.extname(aabName).length) + '.apk';
|
|
54
54
|
const tmpRoot = await support_1.tempDir.openDir();
|
|
55
|
-
const tmpApksPath =
|
|
55
|
+
const tmpApksPath = node_path_1.default.join(tmpRoot, `${aabName}.apks`);
|
|
56
56
|
try {
|
|
57
57
|
return await AAB_CACHE_GUARD.acquire(aabPath, async () => {
|
|
58
58
|
const aabHash = await support_1.fs.hash(aabPath);
|
|
@@ -67,7 +67,7 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
67
67
|
'and key password if the keystore path is set');
|
|
68
68
|
}
|
|
69
69
|
const keystoreHash = await support_1.fs.hash(keystore);
|
|
70
|
-
const keyAliasHash =
|
|
70
|
+
const keyAliasHash = node_crypto_1.default.createHash('sha1');
|
|
71
71
|
keyAliasHash.update(keyAlias);
|
|
72
72
|
cacheHash = [cacheHash, keystoreHash, keyAliasHash.digest('hex')].join(':');
|
|
73
73
|
}
|
|
@@ -75,7 +75,7 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
75
75
|
if (AAB_CACHE.has(cacheHash)) {
|
|
76
76
|
const cachedRoot = AAB_CACHE.get(cacheHash);
|
|
77
77
|
if (cachedRoot) {
|
|
78
|
-
const resultPath =
|
|
78
|
+
const resultPath = node_path_1.default.resolve(cachedRoot, apkName);
|
|
79
79
|
if (await support_1.fs.exists(resultPath)) {
|
|
80
80
|
return resultPath;
|
|
81
81
|
}
|
|
@@ -114,7 +114,7 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
114
114
|
const fileDeletionPromises = [];
|
|
115
115
|
const allFileNames = await support_1.fs.readdir(tmpRoot);
|
|
116
116
|
for (const fileName of allFileNames) {
|
|
117
|
-
const fullPath =
|
|
117
|
+
const fullPath = node_path_1.default.join(tmpRoot, fileName);
|
|
118
118
|
if (fileName === UNIVERSAL_APK) {
|
|
119
119
|
universalApkPath = fullPath;
|
|
120
120
|
}
|
|
@@ -131,7 +131,7 @@ async function extractUniversalApk(aabPath, opts = {}) {
|
|
|
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
|
-
const resultPath =
|
|
134
|
+
const resultPath = node_path_1.default.join(tmpRoot, apkName);
|
|
135
135
|
logger_js_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);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":";;;;;AAgDA,kDA2GC;AA3JD,4CAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const teen_process_1 = require("teen_process");
|
|
|
15
15
|
const logger_js_1 = require("../logger.js");
|
|
16
16
|
const helpers_js_1 = require("../helpers.js");
|
|
17
17
|
const support_1 = require("@appium/support");
|
|
18
|
-
const
|
|
18
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
19
19
|
/**
|
|
20
20
|
* Extract package and main activity name from application manifest.
|
|
21
21
|
*
|
|
@@ -84,7 +84,7 @@ async function compileManifest(manifest, manifestPackage, targetPackage) {
|
|
|
84
84
|
throw new Error('Cannot compile the manifest. The required platform does not exist (API level >= 17)');
|
|
85
85
|
}
|
|
86
86
|
const resultPath = `${manifest}.apk`;
|
|
87
|
-
const androidJarPath =
|
|
87
|
+
const androidJarPath = node_path_1.default.resolve(platformPath, 'android.jar');
|
|
88
88
|
if (await support_1.fs.exists(resultPath)) {
|
|
89
89
|
await support_1.fs.rimraf(resultPath);
|
|
90
90
|
}
|
|
@@ -155,7 +155,7 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
155
155
|
logger_js_1.log.debug(`Inserting manifest '${manifest}', src: '${srcApk}', dst: '${dstApk}'`);
|
|
156
156
|
await support_1.zip.assertValidZip(srcApk);
|
|
157
157
|
await (0, helpers_js_1.unzipFile)(`${manifest}.apk`);
|
|
158
|
-
const manifestName =
|
|
158
|
+
const manifestName = node_path_1.default.basename(manifest);
|
|
159
159
|
try {
|
|
160
160
|
await this.initAapt();
|
|
161
161
|
const binaries = this.binaries;
|
|
@@ -166,7 +166,7 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
166
166
|
}
|
|
167
167
|
catch { }
|
|
168
168
|
await (0, teen_process_1.exec)(binaries.aapt, ['add', dstApk, manifestName], {
|
|
169
|
-
cwd:
|
|
169
|
+
cwd: node_path_1.default.dirname(manifest),
|
|
170
170
|
});
|
|
171
171
|
}
|
|
172
172
|
catch (e) {
|
|
@@ -180,7 +180,7 @@ async function insertManifest(manifest, srcApk, dstApk) {
|
|
|
180
180
|
logger_js_1.log.debug(`Extracting the source apk at '${srcApk}'`);
|
|
181
181
|
await support_1.zip.extractAllTo(srcApk, tmpRoot);
|
|
182
182
|
logger_js_1.log.debug('Moving manifest');
|
|
183
|
-
await support_1.fs.mv(manifest,
|
|
183
|
+
await support_1.fs.mv(manifest, node_path_1.default.resolve(tmpRoot, manifestName));
|
|
184
184
|
logger_js_1.log.debug(`Collecting the destination apk at '${dstApk}'`);
|
|
185
185
|
await support_1.zip.toArchive(dstApk, {
|
|
186
186
|
cwd: tmpRoot,
|
|
@@ -215,14 +215,14 @@ async function hasInternetPermissionFromManifest(appPath) {
|
|
|
215
215
|
*/
|
|
216
216
|
async function getAndroidPlatformAndPath(sdkRoot) {
|
|
217
217
|
const propsPaths = await support_1.fs.glob('*/build.prop', {
|
|
218
|
-
cwd:
|
|
218
|
+
cwd: node_path_1.default.resolve(sdkRoot, 'platforms'),
|
|
219
219
|
absolute: true,
|
|
220
220
|
});
|
|
221
221
|
const platformsMapping = {};
|
|
222
222
|
for (const propsPath of propsPaths) {
|
|
223
223
|
const propsContent = await support_1.fs.readFile(propsPath, 'utf-8');
|
|
224
|
-
const platformPath =
|
|
225
|
-
const platform =
|
|
224
|
+
const platformPath = node_path_1.default.dirname(propsPath);
|
|
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_js_1.log.warn(`Cannot read the SDK version from '${propsPath}'. Skipping '${platform}'`);
|
|
@@ -234,7 +234,7 @@ async function getAndroidPlatformAndPath(sdkRoot) {
|
|
|
234
234
|
};
|
|
235
235
|
}
|
|
236
236
|
if (lodash_1.default.isEmpty(platformsMapping)) {
|
|
237
|
-
logger_js_1.log.warn(`Found zero platform folders at '${
|
|
237
|
+
logger_js_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,
|
|
@@ -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,0CA0EC;AAeD,wCA4CC;AAQD,8EAWC;AAUD,8DAmCC;AA7RD,oDAAuB;AACvB,+CAAkC;AAClC,4CAAiC;AACjC,8CAA6E;AAC7E,6CAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"android-manifest.js","sourceRoot":"","sources":["../../../lib/tools/android-manifest.ts"],"names":[],"mappings":";;;;;AAiBA,oFAeC;AAUD,oEAeC;AAUD,4DAUC;AAWD,0CA0EC;AAeD,wCA4CC;AAQD,8EAWC;AAUD,8DAmCC;AA7RD,oDAAuB;AACvB,+CAAkC;AAClC,4CAAiC;AACjC,8CAA6E;AAC7E,6CAAuD;AACvD,0DAA6B;AAI7B;;;;;;;GAOG;AACI,KAAK,UAAU,oCAAoC,CAExD,OAAe;IAEf,IAAI,OAAO,CAAC,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;QACrC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,EACJ,IAAI,EAAE,UAAU,EAChB,kBAAkB,EAAE,EAAC,IAAI,EAAE,WAAW,EAAC,GACxC,GAAG,MAAM,gCAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAClD,eAAG,CAAC,IAAI,CAAC,kBAAkB,UAAU,GAAG,CAAC,CAAC;IAC1C,eAAG,CAAC,IAAI,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IACjD,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,CAAC;AACnC,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,4BAA4B,CAAY,OAAe;IAC3E,eAAG,CAAC,KAAK,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,OAAO,CAAC;IAChC,IAAI,OAAO,CAAC,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;QACrC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,EAAC,gBAAgB,EAAC,GAAG,MAAM,gCAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IACzE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,uCAAuC,eAAe,UAAU;YAC9D,iCAAiC,CACpC,CAAC;IACJ,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,wBAAwB,CAE5C,GAAW,EACX,YAA2B,IAAI;IAE/B,MAAM,MAAM,GAAG,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/E,OAAO,qBAAqB,IAAI,qBAAqB,CAAC,MAAM,IAAI,CAAC;QAC/D,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,eAAe,CAEnC,QAAgB,EAChB,eAAuB,EACvB,aAAqB;IAErB,MAAM,EAAC,QAAQ,EAAE,YAAY,EAAC,GAAG,MAAM,yBAAyB,CAC9D,IAAI,CAAC,OAAiB,CACvB,CAAC;IACF,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,GAAG,QAAQ,MAAM,CAAC;IACrC,MAAM,cAAc,GAAG,mBAAI,CAAC,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAI,MAAM,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,MAAM,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,0DAA0D;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAwB,CAAC;QAC/C,MAAM,IAAI,GAAG;YACX,MAAM;YACN,IAAI;YACJ,UAAU;YACV,YAAY;YACZ,QAAQ;YACR,2BAA2B;YAC3B,eAAe;YACf,yCAAyC;YACzC,aAAa;YACb,IAAI;YACJ,cAAc;YACd,IAAI;SACL,CAAC;QACF,eAAG,CAAC,KAAK,CACP,iCAAiC,cAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAC1E,CAAC;QACF,MAAM,IAAA,mBAAI,EAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,eAAG,CAAC,KAAK,CACP,+DAA+D;YAC7D,mBAAoB,CAAW,CAAC,OAAO,IAAK,CAAuB,CAAC,MAAM,EAAE,CAC/E,CAAC;QACF,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAwB,CAAC;QAC/C,MAAM,IAAI,GAAG;YACX,SAAS;YACT,IAAI;YACJ,QAAQ;YACR,2BAA2B;YAC3B,eAAe;YACf,yCAAyC;YACzC,aAAa;YACb,IAAI;YACJ,cAAc;YACd,IAAI;YACJ,UAAU;YACV,IAAI;SACL,CAAC;QACF,eAAG,CAAC,KAAK,CACP,iCAAiC,cAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CACzE,CAAC;QACF,IAAI,CAAC;YACH,MAAM,IAAA,mBAAI,EAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,gDAAiD,EAAY,CAAC,OAAO,IAAK,EAAwB,CAAC,MAAM,EAAE,CAC5G,CAAC;QACJ,CAAC;IACH,CAAC;IACD,eAAG,CAAC,KAAK,CAAC,6BAA6B,UAAU,GAAG,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,cAAc,CAElC,QAAgB,EAChB,MAAc,EACd,MAAc;IAEd,eAAG,CAAC,KAAK,CAAC,uBAAuB,QAAQ,YAAY,MAAM,YAAY,MAAM,GAAG,CAAC,CAAC;IAClF,MAAM,aAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,IAAA,sBAAS,EAAC,GAAG,QAAQ,MAAM,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,mBAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAwB,CAAC;QAC/C,MAAM,YAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClC,eAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,IAAA,mBAAI,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;QAC9D,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,MAAM,IAAA,mBAAI,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE;YACvD,GAAG,EAAE,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,eAAG,CAAC,KAAK,CACP,wDAAwD;YACtD,mBAAoB,CAAW,CAAC,OAAO,IAAK,CAAuB,CAAC,MAAM,EAAE,CAC/E,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,iBAAO,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,6DAA6D;YAC7D,2DAA2D;YAC3D,iCAAiC;YACjC,eAAG,CAAC,KAAK,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAC;YACtD,MAAM,aAAG,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACxC,eAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC7B,MAAM,YAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;YAC3D,eAAG,CAAC,KAAK,CAAC,sCAAsC,MAAM,GAAG,CAAC,CAAC;YAC3D,MAAM,aAAG,CAAC,SAAS,CAAC,MAAM,EAAE;gBAC1B,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,YAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,eAAG,CAAC,KAAK,CAAC,4BAA4B,MAAM,gBAAgB,CAAC,CAAC;AAChE,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAErD,OAAe;IAEf,eAAG,CAAC,KAAK,CAAC,gBAAgB,OAAO,uDAAuD,CAAC,CAAC;IAC1F,IAAI,OAAO,CAAC,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;QACrC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,gCAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IACxE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,KAAK,6BAA6B,CAAC,CAAC;AACxF,CAAC;AAED,4BAA4B;AAE5B;;;;;GAKG;AACI,KAAK,UAAU,yBAAyB,CAAC,OAAe;IAC7D,MAAM,UAAU,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,cAAc,EAAE;QAC/C,GAAG,EAAE,mBAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC;QACvC,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAiC,EAAE,CAAC;IAC1D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,mBAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,+BAA+B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,eAAG,CAAC,IAAI,CAAC,qCAAqC,SAAS,gBAAgB,QAAQ,GAAG,CAAC,CAAC;YACpF,SAAS;QACX,CAAC;QACD,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG;YACzC,QAAQ;YACR,YAAY;SACb,CAAC;IACJ,CAAC;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAChC,eAAG,CAAC,IAAI,CACN,mCAAmC,mBAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK;YACxE,yCAAyC,CAC5C,CAAC;QACF,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAClD,eAAG,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,aAAa"}
|
|
@@ -13,15 +13,15 @@ exports.getKeystoreHash = getKeystoreHash;
|
|
|
13
13
|
exports.getApksignerForOs = getApksignerForOs;
|
|
14
14
|
exports.unsignApk = unsignApk;
|
|
15
15
|
const lodash_1 = __importDefault(require("lodash"));
|
|
16
|
-
const
|
|
16
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
17
17
|
const teen_process_1 = require("teen_process");
|
|
18
|
-
const
|
|
18
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
19
19
|
const logger_js_1 = require("../logger.js");
|
|
20
20
|
const support_1 = require("@appium/support");
|
|
21
21
|
const lru_cache_1 = require("lru-cache");
|
|
22
22
|
const helpers_js_1 = require("../helpers.js");
|
|
23
|
-
const DEFAULT_PRIVATE_KEY =
|
|
24
|
-
const DEFAULT_CERTIFICATE =
|
|
23
|
+
const DEFAULT_PRIVATE_KEY = node_path_1.default.join('keys', 'testkey.pk8');
|
|
24
|
+
const DEFAULT_CERTIFICATE = node_path_1.default.join('keys', 'testkey.x509.pem');
|
|
25
25
|
const BUNDLETOOL_TUTORIAL = 'https://developer.android.com/studio/command-line/bundletool';
|
|
26
26
|
const APKSIGNER_VERIFY_FAIL = 'DOES NOT VERIFY';
|
|
27
27
|
const SHA1 = 'sha1';
|
|
@@ -49,7 +49,7 @@ async function executeApksigner(args) {
|
|
|
49
49
|
logger_js_1.log.debug(`Starting apksigner: ${support_1.util.quote(fullCmd)}`);
|
|
50
50
|
// It is necessary to specify CWD explicitly; see https://github.com/appium/appium/issues/14724#issuecomment-737446715
|
|
51
51
|
const { stdout, stderr } = await (0, teen_process_1.exec)(fullCmd[0], fullCmd.slice(1), {
|
|
52
|
-
cwd:
|
|
52
|
+
cwd: node_path_1.default.dirname(apkSignerJar),
|
|
53
53
|
// @ts-ignore This works
|
|
54
54
|
windowsVerbatimArguments: support_1.system.isWindows(),
|
|
55
55
|
});
|
|
@@ -141,7 +141,7 @@ async function signWithCustomCert(apk) {
|
|
|
141
141
|
else {
|
|
142
142
|
logger_js_1.log.debug(`'${apk}' does not need to be unsigned`);
|
|
143
143
|
}
|
|
144
|
-
const jarsigner =
|
|
144
|
+
const jarsigner = node_path_1.default.resolve(await (0, helpers_js_1.getJavaHome)(), 'bin', `jarsigner${support_1.system.isWindows() ? '.exe' : ''}`);
|
|
145
145
|
const fullCmd = [
|
|
146
146
|
jarsigner,
|
|
147
147
|
'-sigalg',
|
|
@@ -223,15 +223,15 @@ async function zipAlignApk(apk) {
|
|
|
223
223
|
logger_js_1.log.debug(`'${apk}' is not zip-aligned. Aligning`);
|
|
224
224
|
}
|
|
225
225
|
try {
|
|
226
|
-
await support_1.fs.access(apk,
|
|
226
|
+
await support_1.fs.access(apk, node_fs_1.default.constants.W_OK);
|
|
227
227
|
}
|
|
228
228
|
catch {
|
|
229
229
|
throw new Error(`The file at '${apk}' is not writeable. ` +
|
|
230
|
-
`Please grant write permissions to this file or to its parent folder '${
|
|
230
|
+
`Please grant write permissions to this file or to its parent folder '${node_path_1.default.dirname(apk)}' ` +
|
|
231
231
|
`for the Appium process, so it can zip-align the file`);
|
|
232
232
|
}
|
|
233
233
|
const alignedApk = await support_1.tempDir.path({ prefix: 'appium', suffix: '.tmp' });
|
|
234
|
-
await (0, support_1.mkdirp)(
|
|
234
|
+
await (0, support_1.mkdirp)(node_path_1.default.dirname(alignedApk));
|
|
235
235
|
try {
|
|
236
236
|
await (0, teen_process_1.exec)(this.binaries.zipalign, ['-f', '4', apk, alignedApk]);
|
|
237
237
|
await support_1.fs.mv(alignedApk, apk, { mkdirp: true });
|
|
@@ -260,13 +260,13 @@ async function checkApkCert(appPath, pkg, opts = {}) {
|
|
|
260
260
|
return false;
|
|
261
261
|
}
|
|
262
262
|
let actualAppPath = appPath;
|
|
263
|
-
if (
|
|
263
|
+
if (node_path_1.default.extname(appPath) === helpers_js_1.APKS_EXTENSION) {
|
|
264
264
|
actualAppPath = await this.extractBaseApk(appPath);
|
|
265
265
|
}
|
|
266
266
|
const hashMatches = (apksignerOutput, expectedHashes) => {
|
|
267
267
|
for (const [name, value] of lodash_1.default.toPairs(expectedHashes)) {
|
|
268
268
|
if (value && new RegExp(`digest:\\s+${value}\\b`, 'i').test(apksignerOutput)) {
|
|
269
|
-
logger_js_1.log.debug(`${name} hash did match for '${
|
|
269
|
+
logger_js_1.log.debug(`${name} hash did match for '${node_path_1.default.basename(actualAppPath)}'`);
|
|
270
270
|
return true;
|
|
271
271
|
}
|
|
272
272
|
}
|
|
@@ -275,7 +275,7 @@ async function checkApkCert(appPath, pkg, opts = {}) {
|
|
|
275
275
|
const { requireDefaultCert = true } = opts;
|
|
276
276
|
const appHash = await support_1.fs.hash(actualAppPath);
|
|
277
277
|
if (SIGNED_APPS_CACHE.has(appHash)) {
|
|
278
|
-
logger_js_1.log.debug(`Using the previously cached signature entry for '${
|
|
278
|
+
logger_js_1.log.debug(`Using the previously cached signature entry for '${node_path_1.default.basename(actualAppPath)}'`);
|
|
279
279
|
const cached = SIGNED_APPS_CACHE.get(appHash);
|
|
280
280
|
if (cached) {
|
|
281
281
|
const { keystorePath, output, expected } = cached;
|
|
@@ -339,7 +339,7 @@ async function checkApkCert(appPath, pkg, opts = {}) {
|
|
|
339
339
|
*/
|
|
340
340
|
async function getKeystoreHash() {
|
|
341
341
|
logger_js_1.log.debug(`Getting hash of the '${this.keystorePath}' keystore`);
|
|
342
|
-
const keytool =
|
|
342
|
+
const keytool = node_path_1.default.resolve(await (0, helpers_js_1.getJavaHome)(), 'bin', `keytool${support_1.system.isWindows() ? '.exe' : ''}`);
|
|
343
343
|
if (!(await support_1.fs.exists(keytool))) {
|
|
344
344
|
throw new Error(`The keytool utility cannot be found at '${keytool}'`);
|
|
345
345
|
}
|
|
@@ -414,10 +414,10 @@ async function unsignApk(apkPath) {
|
|
|
414
414
|
if (!hasMetaInf) {
|
|
415
415
|
return false;
|
|
416
416
|
}
|
|
417
|
-
const tmpZipRoot =
|
|
417
|
+
const tmpZipRoot = node_path_1.default.resolve(tmpRoot, 'apk');
|
|
418
418
|
await support_1.zip.extractAllTo(apkPath, tmpZipRoot);
|
|
419
|
-
await support_1.fs.rimraf(
|
|
420
|
-
const tmpResultPath =
|
|
419
|
+
await support_1.fs.rimraf(node_path_1.default.resolve(tmpZipRoot, metaInfFolderName));
|
|
420
|
+
const tmpResultPath = node_path_1.default.resolve(tmpRoot, node_path_1.default.basename(apkPath));
|
|
421
421
|
await support_1.zip.toArchive(tmpResultPath, {
|
|
422
422
|
cwd: tmpZipRoot,
|
|
423
423
|
});
|
|
@@ -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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"}
|
|
@@ -50,11 +50,11 @@ exports.parseAaptStrings = parseAaptStrings;
|
|
|
50
50
|
const helpers_js_1 = require("../helpers.js");
|
|
51
51
|
const teen_process_1 = require("teen_process");
|
|
52
52
|
const logger_js_1 = require("../logger.js");
|
|
53
|
-
const
|
|
53
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
54
54
|
const lodash_1 = __importDefault(require("lodash"));
|
|
55
55
|
const support_1 = require("@appium/support");
|
|
56
56
|
const semver = __importStar(require("semver"));
|
|
57
|
-
const
|
|
57
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
58
58
|
const lru_cache_1 = require("lru-cache");
|
|
59
59
|
exports.REMOTE_CACHE_ROOT = '/data/local/tmp/appium_cache';
|
|
60
60
|
/**
|
|
@@ -116,7 +116,7 @@ async function installFromDevicePath(apkPathOnDevice, opts = {}) {
|
|
|
116
116
|
*/
|
|
117
117
|
async function cacheApk(apkPath, options = {}) {
|
|
118
118
|
const appHash = await support_1.fs.hash(apkPath);
|
|
119
|
-
const remotePath =
|
|
119
|
+
const remotePath = node_path_1.default.posix.join(exports.REMOTE_CACHE_ROOT, `${appHash}.apk`);
|
|
120
120
|
const remoteCachedFiles = [];
|
|
121
121
|
// Get current contents of the remote cache or create it for the first time
|
|
122
122
|
try {
|
|
@@ -153,7 +153,7 @@ async function cacheApk(apkPath, options = {}) {
|
|
|
153
153
|
await this.shell(['mkdir', '-p', exports.REMOTE_CACHE_ROOT]);
|
|
154
154
|
}
|
|
155
155
|
logger_js_1.log.debug(`The count of applications in the cache: ${remoteCachedFiles.length}`);
|
|
156
|
-
const toHash = (remotePath) =>
|
|
156
|
+
const toHash = (remotePath) => node_path_1.default.posix.parse(remotePath).name;
|
|
157
157
|
// Push the apk to the remote cache if needed
|
|
158
158
|
if (remoteCachedFiles.some((x) => toHash(x) === appHash)) {
|
|
159
159
|
logger_js_1.log.info(`The application at '${apkPath}' is already cached to '${remotePath}'`);
|
|
@@ -167,7 +167,7 @@ async function cacheApk(apkPath, options = {}) {
|
|
|
167
167
|
const timer = new support_1.timing.Timer().start();
|
|
168
168
|
await this.push(apkPath, remotePath, { timeout: options.timeout });
|
|
169
169
|
const { size } = await support_1.fs.stat(apkPath);
|
|
170
|
-
logger_js_1.log.info(`The upload of '${
|
|
170
|
+
logger_js_1.log.info(`The upload of '${node_path_1.default.basename(apkPath)}' (${support_1.util.toReadableSizeString(size)}) ` +
|
|
171
171
|
`took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
172
172
|
}
|
|
173
173
|
if (!this.remoteAppsCache) {
|
|
@@ -181,7 +181,7 @@ async function cacheApk(apkPath, options = {}) {
|
|
|
181
181
|
this.remoteAppsCache.set(appHash, remotePath);
|
|
182
182
|
// If the remote cache exceeds this.remoteAppsCacheLimit, remove the least recently used entries
|
|
183
183
|
const entriesToCleanup = remoteCachedFiles
|
|
184
|
-
.map((x) =>
|
|
184
|
+
.map((x) => node_path_1.default.posix.join(exports.REMOTE_CACHE_ROOT, x))
|
|
185
185
|
.filter((x) => !this.remoteAppsCache.has(toHash(x)))
|
|
186
186
|
.slice(this.remoteAppsCacheLimit - [...this.remoteAppsCache.keys()].length);
|
|
187
187
|
if (!lodash_1.default.isEmpty(entriesToCleanup)) {
|
|
@@ -228,7 +228,7 @@ async function install(appPath, options = {}) {
|
|
|
228
228
|
try {
|
|
229
229
|
const timer = new support_1.timing.Timer().start();
|
|
230
230
|
const output = await this.adbExec(installCmd, installOpts);
|
|
231
|
-
logger_js_1.log.info(`The installation of '${
|
|
231
|
+
logger_js_1.log.info(`The installation of '${node_path_1.default.basename(appPath)}' took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
232
232
|
const truncatedOutput = !lodash_1.default.isString(output) || output.length <= 300
|
|
233
233
|
? output
|
|
234
234
|
: `${output.substring(0, 150)}...${output.substring(output.length - 150)}`;
|
|
@@ -426,7 +426,7 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
|
|
|
426
426
|
'configurations',
|
|
427
427
|
appPath,
|
|
428
428
|
]);
|
|
429
|
-
return lodash_1.default.uniq(stdout.split(
|
|
429
|
+
return lodash_1.default.uniq(stdout.split(node_os_1.default.EOL));
|
|
430
430
|
}, language, '(default)');
|
|
431
431
|
const { stdout } = await (0, teen_process_1.exec)(this.binaries.aapt, [
|
|
432
432
|
'd',
|
|
@@ -447,7 +447,7 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
|
|
|
447
447
|
'configurations',
|
|
448
448
|
appPath,
|
|
449
449
|
]);
|
|
450
|
-
return lodash_1.default.uniq(stdout.split(
|
|
450
|
+
return lodash_1.default.uniq(stdout.split(node_os_1.default.EOL));
|
|
451
451
|
}, language, '');
|
|
452
452
|
try {
|
|
453
453
|
const { stdout } = await (0, teen_process_1.exec)(this.binaries.aapt2, [
|
|
@@ -473,7 +473,7 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
|
|
|
473
473
|
if (!outRoot) {
|
|
474
474
|
return { apkStrings };
|
|
475
475
|
}
|
|
476
|
-
const localPath =
|
|
476
|
+
const localPath = node_path_1.default.resolve(outRoot, 'strings.json');
|
|
477
477
|
await (0, support_1.mkdirp)(outRoot);
|
|
478
478
|
await support_1.fs.writeFile(localPath, JSON.stringify(apkStrings, null, 2), 'utf-8');
|
|
479
479
|
return { apkStrings, localPath };
|
|
@@ -547,7 +547,7 @@ async function formatConfigMarker(configsGetter, desiredMarker, defaultMarker) {
|
|
|
547
547
|
* given marker then an empty mapping is returned.
|
|
548
548
|
*/
|
|
549
549
|
function parseAapt2Strings(rawOutput, configMarker) {
|
|
550
|
-
const allLines = rawOutput.split(
|
|
550
|
+
const allLines = rawOutput.split(node_os_1.default.EOL);
|
|
551
551
|
function extractContent(startIdx) {
|
|
552
552
|
let idx = startIdx;
|
|
553
553
|
const startCharPos = allLines[startIdx].indexOf('"');
|
|
@@ -665,7 +665,7 @@ function parseAaptStrings(rawOutput, configMarker) {
|
|
|
665
665
|
let isInPluralGroup = false;
|
|
666
666
|
// The pattern matches any quoted content including escaped quotes
|
|
667
667
|
const quotedStringPattern = /"[^"\\]*(?:\\.[^"\\]*)*"/;
|
|
668
|
-
for (const line of rawOutput.split(
|
|
668
|
+
for (const line of rawOutput.split(node_os_1.default.EOL)) {
|
|
669
669
|
const trimmedLine = line.trim();
|
|
670
670
|
if (lodash_1.default.isEmpty(trimmedLine)) {
|
|
671
671
|
continue;
|