appium-adb 14.3.1 → 14.3.2

package/build/lib/tools/apk-signing.js

@@ -16,10 +16,10 @@ const lodash_1 = __importDefault(require("lodash"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const teen_process_1 = require("teen_process");
 const node_path_1 = __importDefault(require("node:path"));
-const logger_js_1 = require("../logger.js");
+const logger_1 = require("../logger");
 const support_1 = require("@appium/support");
 const lru_cache_1 = require("lru-cache");
-const helpers_js_1 = require("../helpers.js");
+const helpers_1 = require("../helpers");
 const DEFAULT_PRIVATE_KEY = node_path_1.default.join('keys', 'testkey.pk8');
 const DEFAULT_CERTIFICATE = node_path_1.default.join('keys', 'testkey.x509.pem');
 const BUNDLETOOL_TUTORIAL = 'https://developer.android.com/studio/command-line/bundletool';
@@ -45,8 +45,8 @@ const SIGNED_APPS_CACHE = new lru_cache_1.LRUCache({
  */
 async function executeApksigner(args) {
     const apkSignerJar = await getApksignerForOs.bind(this)();
-    const fullCmd = [await (0, helpers_js_1.getJavaForOs)(), '-Xmx1024M', '-Xss1m', '-jar', apkSignerJar, ...args];
-    logger_js_1.log.debug(`Starting apksigner: ${support_1.util.quote(fullCmd)}`);
+    const fullCmd = [await (0, helpers_1.getJavaForOs)(), '-Xmx1024M', '-Xss1m', '-jar', apkSignerJar, ...args];
+    logger_1.log.debug(`Starting apksigner: ${support_1.util.quote(fullCmd)}`);
     // It is necessary to specify CWD explicitly; see https://github.com/appium/appium/issues/14724#issuecomment-737446715
     const { stdout, stderr } = await (0, teen_process_1.exec)(fullCmd[0], fullCmd.slice(1), {
         cwd: node_path_1.default.dirname(apkSignerJar),
@@ -64,10 +64,10 @@ async function executeApksigner(args) {
                 .split('\n')
                 .filter((line) => !line.includes('WARNING:'))
                 .join('\n');
-            logger_js_1.log.debug(`apksigner ${name}: ${filteredStream}`);
+            logger_1.log.debug(`apksigner ${name}: ${filteredStream}`);
         }
         else {
-            logger_js_1.log.debug(`apksigner ${name}: ${stream}`);
+            logger_1.log.debug(`apksigner ${name}: ${stream}`);
         }
     }
     return stdout;
@@ -79,16 +79,16 @@ async function executeApksigner(args) {
  * @throws If signing fails.
  */
 async function signWithDefaultCert(apk) {
-    logger_js_1.log.debug(`Signing '${apk}' with default cert`);
+    logger_1.log.debug(`Signing '${apk}' with default cert`);
     if (!(await support_1.fs.exists(apk))) {
         throw new Error(`${apk} file doesn't exist.`);
     }
     const args = [
         'sign',
         '--key',
-        await (0, helpers_js_1.getResourcePath)(DEFAULT_PRIVATE_KEY),
+        await (0, helpers_1.getResourcePath)(DEFAULT_PRIVATE_KEY),
         '--cert',
-        await (0, helpers_js_1.getResourcePath)(DEFAULT_CERTIFICATE),
+        await (0, helpers_1.getResourcePath)(DEFAULT_CERTIFICATE),
         apk,
     ];
     try {
@@ -107,7 +107,7 @@ async function signWithDefaultCert(apk) {
  * @throws If signing fails.
  */
 async function signWithCustomCert(apk) {
-    logger_js_1.log.debug(`Signing '${apk}' with custom cert`);
+    logger_1.log.debug(`Signing '${apk}' with custom cert`);
     if (!(await support_1.fs.exists(this.keystorePath))) {
         throw new Error(`Keystore: ${this.keystorePath} doesn't exist.`);
     }
@@ -130,16 +130,16 @@ async function signWithCustomCert(apk) {
     }
     catch (err) {
         const error = err;
-        logger_js_1.log.warn(`Cannot use apksigner tool for signing. Defaulting to jarsigner. ` +
+        logger_1.log.warn(`Cannot use apksigner tool for signing. Defaulting to jarsigner. ` +
             `Original error: ${error.stderr || error.stdout || error.message}`);
         try {
             if (await unsignApk(apk)) {
-                logger_js_1.log.debug(`'${apk}' has been successfully unsigned`);
+                logger_1.log.debug(`'${apk}' has been successfully unsigned`);
             }
             else {
-                logger_js_1.log.debug(`'${apk}' does not need to be unsigned`);
+                logger_1.log.debug(`'${apk}' does not need to be unsigned`);
             }
-            const jarsigner = node_path_1.default.resolve(await (0, helpers_js_1.getJavaHome)(), 'bin', `jarsigner${support_1.system.isWindows() ? '.exe' : ''}`);
+            const jarsigner = node_path_1.default.resolve(await (0, helpers_1.getJavaHome)(), 'bin', `jarsigner${support_1.system.isWindows() ? '.exe' : ''}`);
             const fullCmd = [
                 jarsigner,
                 '-sigalg',
@@ -155,7 +155,7 @@ async function signWithCustomCert(apk) {
                 apk,
                 this.keyAlias,
             ];
-            logger_js_1.log.debug(`Starting jarsigner: ${support_1.util.quote(fullCmd)}`);
+            logger_1.log.debug(`Starting jarsigner: ${support_1.util.quote(fullCmd)}`);
             await (0, teen_process_1.exec)(fullCmd[0], fullCmd.slice(1));
         }
         catch (e) {
@@ -174,7 +174,7 @@ async function signWithCustomCert(apk) {
  * @throws If signing fails.
  */
 async function sign(appPath) {
-    if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
+    if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
         let message = 'Signing of .apks-files is not supported. ';
         if (this.useKeystore) {
             message +=
@@ -186,7 +186,7 @@ async function sign(appPath) {
                 `Consider manual application bundle signing with the key at '${DEFAULT_PRIVATE_KEY}' ` +
                     `and the certificate at '${DEFAULT_CERTIFICATE}'. Read ${BUNDLETOOL_TUTORIAL} for more details.`;
         }
-        logger_js_1.log.warn(message);
+        logger_1.log.warn(message);
         return;
     }
     // it is necessary to apply zipalign only before signing
@@ -211,11 +211,11 @@ async function zipAlignApk(apk) {
     await this.initZipAlign();
     try {
         await (0, teen_process_1.exec)(this.binaries.zipalign, ['-c', '4', apk]);
-        logger_js_1.log.debug(`${apk}' is already zip-aligned. Doing nothing`);
+        logger_1.log.debug(`${apk}' is already zip-aligned. Doing nothing`);
         return false;
     }
     catch {
-        logger_js_1.log.debug(`'${apk}' is not zip-aligned. Aligning`);
+        logger_1.log.debug(`'${apk}' is not zip-aligned. Aligning`);
     }
     try {
         await support_1.fs.access(apk, node_fs_1.default.constants.W_OK);
@@ -249,19 +249,19 @@ async function zipAlignApk(apk) {
  * @returns True if given application is already signed.
  */
 async function checkApkCert(appPath, pkg, opts = {}) {
-    logger_js_1.log.debug(`Checking app cert for ${appPath}`);
+    logger_1.log.debug(`Checking app cert for ${appPath}`);
     if (!(await support_1.fs.exists(appPath))) {
-        logger_js_1.log.debug(`'${appPath}' does not exist`);
+        logger_1.log.debug(`'${appPath}' does not exist`);
         return false;
     }
     let actualAppPath = appPath;
-    if (node_path_1.default.extname(appPath) === helpers_js_1.APKS_EXTENSION) {
+    if (node_path_1.default.extname(appPath) === helpers_1.APKS_EXTENSION) {
         actualAppPath = await this.extractBaseApk(appPath);
     }
     const hashMatches = (apksignerOutput, expectedHashes) => {
         for (const [name, value] of lodash_1.default.toPairs(expectedHashes)) {
             if (value && new RegExp(`digest:\\s+${value}\\b`, 'i').test(apksignerOutput)) {
-                logger_js_1.log.debug(`${name} hash did match for '${node_path_1.default.basename(actualAppPath)}'`);
+                logger_1.log.debug(`${name} hash did match for '${node_path_1.default.basename(actualAppPath)}'`);
                 return true;
             }
         }
@@ -270,7 +270,7 @@ async function checkApkCert(appPath, pkg, opts = {}) {
     const { requireDefaultCert = true } = opts;
     const appHash = await support_1.fs.hash(actualAppPath);
     if (SIGNED_APPS_CACHE.has(appHash)) {
-        logger_js_1.log.debug(`Using the previously cached signature entry for '${node_path_1.default.basename(actualAppPath)}'`);
+        logger_1.log.debug(`Using the previously cached signature entry for '${node_path_1.default.basename(actualAppPath)}'`);
         const cached = SIGNED_APPS_CACHE.get(appHash);
         if (cached) {
             const { keystorePath, output, expected } = cached;
@@ -285,11 +285,11 @@ async function checkApkCert(appPath, pkg, opts = {}) {
         const output = await this.executeApksigner(['verify', '--print-certs', actualAppPath]);
         const hasMatch = hashMatches(output, expected);
         if (hasMatch) {
-            logger_js_1.log.info(`'${actualAppPath}' is signed with the ` +
+            logger_1.log.info(`'${actualAppPath}' is signed with the ` +
                 `${this.useKeystore ? 'keystore' : 'default'} certificate`);
         }
         else {
-            logger_js_1.log.info(`'${actualAppPath}' is signed with a ` +
+            logger_1.log.info(`'${actualAppPath}' is signed with a ` +
                 `non-${this.useKeystore ? 'keystore' : 'default'} certificate`);
         }
         const isSigned = (!this.useKeystore && !requireDefaultCert) || hasMatch;
@@ -306,7 +306,7 @@ async function checkApkCert(appPath, pkg, opts = {}) {
         const error = err;
         // check if there is no signature
         if (lodash_1.default.includes(error.stderr, APKSIGNER_VERIFY_FAIL)) {
-            logger_js_1.log.info(`'${actualAppPath}' is not signed`);
+            logger_1.log.info(`'${actualAppPath}' is not signed`);
             return false;
         }
         const errMsg = error.stderr || error.stdout || error.message;
@@ -319,8 +319,8 @@ async function checkApkCert(appPath, pkg, opts = {}) {
             // If these are not signed, e.g. in case of Espresso, then the next step(s)
             // would anyway fail.
             // See https://github.com/appium/appium/issues/14724 for more details.
-            logger_js_1.log.warn(errMsg);
-            logger_js_1.log.warn(`Assuming '${actualAppPath}' is already signed and continuing anyway`);
+            logger_1.log.warn(errMsg);
+            logger_1.log.warn(`Assuming '${actualAppPath}' is already signed and continuing anyway`);
             return true;
         }
         throw new Error(`Cannot verify the signature of '${actualAppPath}'. ` + `Original error: ${errMsg}`);
@@ -333,8 +333,8 @@ async function checkApkCert(appPath, pkg, opts = {}) {
  * @throws If getting keystore hash fails.
  */
 async function getKeystoreHash() {
-    logger_js_1.log.debug(`Getting hash of the '${this.keystorePath}' keystore`);
-    const keytool = node_path_1.default.resolve(await (0, helpers_js_1.getJavaHome)(), 'bin', `keytool${support_1.system.isWindows() ? '.exe' : ''}`);
+    logger_1.log.debug(`Getting hash of the '${this.keystorePath}' keystore`);
+    const keytool = node_path_1.default.resolve(await (0, helpers_1.getJavaHome)(), 'bin', `keytool${support_1.system.isWindows() ? '.exe' : ''}`);
     if (!(await support_1.fs.exists(keytool))) {
         throw new Error(`The keytool utility cannot be found at '${keytool}'`);
     }
@@ -348,7 +348,7 @@ async function getKeystoreHash() {
         '-storepass',
         this.keystorePassword,
     ];
-    logger_js_1.log.info(`Running '${keytool}' with arguments: ${support_1.util.quote(args)}`);
+    logger_1.log.info(`Running '${keytool}' with arguments: ${support_1.util.quote(args)}`);
     try {
         const { stdout } = await (0, teen_process_1.exec)(keytool, args);
         const result = {};
@@ -361,10 +361,10 @@ async function getKeystoreHash() {
             result[hashName] = match[1].replace(/:/g, '').toLowerCase();
         }
         if (lodash_1.default.isEmpty(result)) {
-            logger_js_1.log.debug(stdout);
+            logger_1.log.debug(stdout);
             throw new Error('Cannot parse the hash value from the keytool output');
         }
-        logger_js_1.log.debug(`Keystore hash: ${JSON.stringify(result)}`);
+        logger_1.log.debug(`Keystore hash: ${JSON.stringify(result)}`);
         return result;
     }
     catch (e) {

package/build/lib/tools/apk-signing.js.map

@@ -1 +1 @@
-{"version":3,"file":"apk-signing.js","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apk-signing.js","sourceRoot":"","sources":["../../../lib/tools/apk-signing.ts"],"names":[],"mappings":"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"}

package/build/lib/tools/apk-utils.d.ts

@@ -1,5 +1,5 @@
-import type { ADB } from '../adb.js';
-import type { UninstallOptions, ShellExecOptions, CachingOptions, InstallOptions, InstallOrUpgradeOptions, InstallOrUpgradeResult, ApkStrings, AppInfo, InstallState, StringRecord } from './types.js';
+import type { ADB } from '../adb';
+import type { UninstallOptions, ShellExecOptions, CachingOptions, InstallOptions, InstallOrUpgradeOptions, InstallOrUpgradeResult, ApkStrings, AppInfo, InstallState, StringRecord } from './types';
 export declare const REMOTE_CACHE_ROOT = "/data/local/tmp/appium_cache";
 /**
  * Uninstall the given package from the device under test.

package/build/lib/tools/apk-utils.d.ts.map

@@ -1 +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,CAoDf;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"}
+{"version":3,"file":"apk-utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/apk-utils.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,uBAAuB,EACvB,sBAAsB,EACtB,UAAU,EACV,OAAO,EACP,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB,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,CAoDf;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"}

package/build/lib/tools/apk-utils.js

@@ -47,9 +47,9 @@ exports.extractStringsFromApk = extractStringsFromApk;
 exports.getApkInfo = getApkInfo;
 exports.parseAapt2Strings = parseAapt2Strings;
 exports.parseAaptStrings = parseAaptStrings;
-const helpers_js_1 = require("../helpers.js");
+const helpers_1 = require("../helpers");
 const teen_process_1 = require("teen_process");
-const logger_js_1 = require("../logger.js");
+const logger_1 = require("../logger");
 const node_path_1 = __importDefault(require("node:path"));
 const lodash_1 = __importDefault(require("lodash"));
 const support_1 = require("@appium/support");
@@ -66,9 +66,9 @@ exports.REMOTE_CACHE_ROOT = '/data/local/tmp/appium_cache';
  *                   successfully uninstalled.
  */
 async function uninstallApk(pkg, options = {}) {
-    logger_js_1.log.debug(`Uninstalling ${pkg}`);
+    logger_1.log.debug(`Uninstalling ${pkg}`);
     if (!options.skipInstallCheck && !(await this.isAppInstalled(pkg))) {
-        logger_js_1.log.info(`${pkg} was not uninstalled, because it was not present on the device`);
+        logger_1.log.info(`${pkg} was not uninstalled, because it was not present on the device`);
         return false;
     }
     const cmd = ['uninstall'];
@@ -85,12 +85,12 @@ async function uninstallApk(pkg, options = {}) {
         const err = e;
         throw new Error(`Unable to uninstall APK. Original error: ${err.message}`);
     }
-    logger_js_1.log.debug(`'adb ${cmd.join(' ')}' command output: ${stdout}`);
+    logger_1.log.debug(`'adb ${cmd.join(' ')}' command output: ${stdout}`);
     if (stdout.includes('Success')) {
-        logger_js_1.log.info(`${pkg} was successfully uninstalled`);
+        logger_1.log.info(`${pkg} was successfully uninstalled`);
         return true;
     }
-    logger_js_1.log.info(`${pkg} was not uninstalled`);
+    logger_1.log.info(`${pkg} was not uninstalled`);
     return false;
 }
 /**
@@ -129,7 +129,7 @@ async function cacheApk(apkPath, options = {}) {
         if (!lodash_1.default.isString(lsOutput) ||
             (lsOutput.includes(errorMarker) && !lsOutput.includes(exports.REMOTE_CACHE_ROOT))) {
             if (!lodash_1.default.isBoolean(this._areExtendedLsOptionsSupported)) {
-                logger_js_1.log.debug('The current Android API does not support extended ls options. ' +
+                logger_1.log.debug('The current Android API does not support extended ls options. ' +
                     'Defaulting to no-options call');
             }
             lsOutput = await this.shell([`ls ${exports.REMOTE_CACHE_ROOT} 2>&1 || echo ${errorMarker}`]);
@@ -148,26 +148,26 @@ async function cacheApk(apkPath, options = {}) {
     }
     catch (e) {
         const err = e;
-        logger_js_1.log.debug(`Got an error '${err.message.trim()}' while getting the list of files in the cache. ` +
+        logger_1.log.debug(`Got an error '${err.message.trim()}' while getting the list of files in the cache. ` +
             `Assuming the cache does not exist yet`);
         await this.shell(['mkdir', '-p', exports.REMOTE_CACHE_ROOT]);
     }
-    logger_js_1.log.debug(`The count of applications in the cache: ${remoteCachedFiles.length}`);
+    logger_1.log.debug(`The count of applications in the cache: ${remoteCachedFiles.length}`);
     const toHash = (remotePath) => node_path_1.default.posix.parse(remotePath).name;
     // Push the apk to the remote cache if needed
     if (remoteCachedFiles.some((x) => toHash(x) === appHash)) {
-        logger_js_1.log.info(`The application at '${apkPath}' is already cached to '${remotePath}'`);
+        logger_1.log.info(`The application at '${apkPath}' is already cached to '${remotePath}'`);
         // Update the application timestamp asynchronously in order to bump its position
         // in the sorted ls output
         // eslint-disable-next-line promise/prefer-await-to-then
         this.shell(['touch', '-am', remotePath]).catch(() => { });
     }
     else {
-        logger_js_1.log.info(`Caching the application at '${apkPath}' to '${remotePath}'`);
+        logger_1.log.info(`Caching the application at '${apkPath}' to '${remotePath}'`);
         const timer = new support_1.timing.Timer().start();
         await this.push(apkPath, remotePath, { timeout: options.timeout });
         const { size } = await support_1.fs.stat(apkPath);
-        logger_js_1.log.info(`The upload of '${node_path_1.default.basename(apkPath)}' (${support_1.util.toReadableSizeString(size)}) ` +
+        logger_1.log.info(`The upload of '${node_path_1.default.basename(apkPath)}' (${support_1.util.toReadableSizeString(size)}) ` +
             `took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
     }
     if (!this.remoteAppsCache) {
@@ -187,11 +187,11 @@ async function cacheApk(apkPath, options = {}) {
     if (!lodash_1.default.isEmpty(entriesToCleanup)) {
         try {
             await this.shell(['rm', '-f', ...entriesToCleanup]);
-            logger_js_1.log.debug(`Deleted ${entriesToCleanup.length} expired application cache entries`);
+            logger_1.log.debug(`Deleted ${entriesToCleanup.length} expired application cache entries`);
         }
         catch (e) {
             const err = e;
-            logger_js_1.log.warn(`Cannot delete ${entriesToCleanup.length} expired application cache entries. ` +
+            logger_1.log.warn(`Cannot delete ${entriesToCleanup.length} expired application cache entries. ` +
                 `Original error: ${err.message}`);
         }
     }
@@ -205,16 +205,16 @@ async function cacheApk(apkPath, options = {}) {
  * @throws If an unexpected error happens during install.
  */
 async function install(appPath, options = {}) {
-    if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
+    if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
         return await this.installApks(appPath, options);
     }
     options = lodash_1.default.cloneDeep(options);
     lodash_1.default.defaults(options, {
         replace: true,
-        timeout: this.adbExecTimeout === helpers_js_1.DEFAULT_ADB_EXEC_TIMEOUT ? helpers_js_1.APK_INSTALL_TIMEOUT : this.adbExecTimeout,
+        timeout: this.adbExecTimeout === helpers_1.DEFAULT_ADB_EXEC_TIMEOUT ? helpers_1.APK_INSTALL_TIMEOUT : this.adbExecTimeout,
         timeoutCapName: 'androidInstallTimeout',
     });
-    const installArgs = (0, helpers_js_1.buildInstallArgs)(await this.getApiLevel(), options);
+    const installArgs = (0, helpers_1.buildInstallArgs)(await this.getApiLevel(), options);
     if (options.noIncremental && (await this.isIncrementalInstallSupported())) {
         // Adb throws an error if it does not know about an arg,
         // which is the case here for older adb versions.
@@ -228,15 +228,15 @@ async function install(appPath, options = {}) {
     try {
         const timer = new support_1.timing.Timer().start();
         const output = await this.adbExec(installCmd, installOpts);
-        logger_js_1.log.info(`The installation of '${node_path_1.default.basename(appPath)}' took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
+        logger_1.log.info(`The installation of '${node_path_1.default.basename(appPath)}' took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
         const truncatedOutput = !lodash_1.default.isString(output) || output.length <= 300
             ? output
             : `${output.substring(0, 150)}...${output.substring(output.length - 150)}`;
-        logger_js_1.log.debug(`Install command stdout: ${truncatedOutput}`);
+        logger_1.log.debug(`Install command stdout: ${truncatedOutput}`);
         if (/\[INSTALL[A-Z_]+FAILED[A-Z_]+\]/.test(output)) {
             if (this.isTestPackageOnlyError(output)) {
                 const msg = `Set 'allowTestPackages' capability to true in order to allow test packages installation.`;
-                logger_js_1.log.warn(msg);
+                logger_1.log.warn(msg);
                 throw new Error(`${output}\n${msg}`);
             }
             throw new Error(output);
@@ -249,7 +249,7 @@ async function install(appPath, options = {}) {
         if (!error.message.includes('INSTALL_FAILED_ALREADY_EXISTS')) {
             throw error;
         }
-        logger_js_1.log.debug(`Application '${appPath}' already installed. Continuing.`);
+        logger_1.log.debug(`Application '${appPath}' already installed. Continuing.`);
     }
 }
 /**
@@ -267,12 +267,12 @@ async function getApplicationInstallState(appPath, pkg = null) {
         pkg = apkInfo?.name;
     }
     if (!pkg) {
-        logger_js_1.log.warn(`Cannot read the package name of '${appPath}'`);
+        logger_1.log.warn(`Cannot read the package name of '${appPath}'`);
         return this.APP_INSTALL_STATE.UNKNOWN;
     }
     const { versionCode: pkgVersionCode, versionName: pkgVersionNameStr, isInstalled, } = await this.getPackageInfo(pkg);
     if (!isInstalled) {
-        logger_js_1.log.debug(`App '${appPath}' is not installed`);
+        logger_1.log.debug(`App '${appPath}' is not installed`);
         return this.APP_INSTALL_STATE.NOT_INSTALLED;
     }
     const pkgVersionName = semver.valid(semver.coerce(pkgVersionNameStr));
@@ -283,15 +283,15 @@ async function getApplicationInstallState(appPath, pkg = null) {
     const { versionCode: apkVersionCode, versionName: apkVersionNameStr } = apkInfo || {};
     const apkVersionName = semver.valid(semver.coerce(apkVersionNameStr));
     if (!lodash_1.default.isInteger(apkVersionCode) || !lodash_1.default.isInteger(pkgVersionCode)) {
-        logger_js_1.log.warn(`Cannot read version codes of '${appPath}' and/or '${pkg}'`);
+        logger_1.log.warn(`Cannot read version codes of '${appPath}' and/or '${pkg}'`);
         if (!lodash_1.default.isString(apkVersionName) || !lodash_1.default.isString(pkgVersionName)) {
-            logger_js_1.log.warn(`Cannot read version names of '${appPath}' and/or '${pkg}'`);
+            logger_1.log.warn(`Cannot read version names of '${appPath}' and/or '${pkg}'`);
             return this.APP_INSTALL_STATE.UNKNOWN;
         }
     }
     if (lodash_1.default.isInteger(apkVersionCode) && lodash_1.default.isInteger(pkgVersionCode)) {
         if (pkgVersionCode > apkVersionCode) {
-            logger_js_1.log.debug(`The version code of the installed '${pkg}' is greater than the application version code (${pkgVersionCode} > ${apkVersionCode})`);
+            logger_1.log.debug(`The version code of the installed '${pkg}' is greater than the application version code (${pkgVersionCode} > ${apkVersionCode})`);
             return this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED;
         }
         // Version codes might not be maintained. Check version names.
@@ -299,13 +299,13 @@ async function getApplicationInstallState(appPath, pkg = null) {
             if (lodash_1.default.isString(apkVersionName) &&
                 lodash_1.default.isString(pkgVersionName) &&
                 semver.satisfies(pkgVersionName, `>=${apkVersionName}`)) {
-                logger_js_1.log.debug(`The version name of the installed '${pkg}' is greater or equal to the application version name ('${pkgVersionName}' >= '${apkVersionName}')`);
+                logger_1.log.debug(`The version name of the installed '${pkg}' is greater or equal to the application version name ('${pkgVersionName}' >= '${apkVersionName}')`);
                 return semver.satisfies(pkgVersionName, `>${apkVersionName}`)
                     ? this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED
                     : this.APP_INSTALL_STATE.SAME_VERSION_INSTALLED;
             }
             if (!lodash_1.default.isString(apkVersionName) || !lodash_1.default.isString(pkgVersionName)) {
-                logger_js_1.log.debug(`The version name of the installed '${pkg}' is equal to application version name (${pkgVersionCode} === ${apkVersionCode})`);
+                logger_1.log.debug(`The version name of the installed '${pkg}' is equal to application version name (${pkgVersionCode} === ${apkVersionCode})`);
                 return this.APP_INSTALL_STATE.SAME_VERSION_INSTALLED;
             }
         }
@@ -313,12 +313,12 @@ async function getApplicationInstallState(appPath, pkg = null) {
     else if (lodash_1.default.isString(apkVersionName) &&
         lodash_1.default.isString(pkgVersionName) &&
         semver.satisfies(pkgVersionName, `>=${apkVersionName}`)) {
-        logger_js_1.log.debug(`The version name of the installed '${pkg}' is greater or equal to the application version name ('${pkgVersionName}' >= '${apkVersionName}')`);
+        logger_1.log.debug(`The version name of the installed '${pkg}' is greater or equal to the application version name ('${pkgVersionName}' >= '${apkVersionName}')`);
         return semver.satisfies(pkgVersionName, `>${apkVersionName}`)
             ? this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED
             : this.APP_INSTALL_STATE.SAME_VERSION_INSTALLED;
     }
-    logger_js_1.log.debug(`The installed '${pkg}' package is older than '${appPath}' (${pkgVersionCode} < ${apkVersionCode} or '${pkgVersionName}' < '${apkVersionName}')'`);
+    logger_1.log.debug(`The installed '${pkg}' package is older than '${appPath}' (${pkgVersionCode} < ${apkVersionCode} or '${pkgVersionName}' < '${apkVersionName}')'`);
     return this.APP_INSTALL_STATE.OLDER_VERSION_INSTALLED;
 }
 /**
@@ -338,7 +338,7 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
             pkg = apkInfo.name;
         }
         else {
-            logger_js_1.log.warn(`Cannot determine the package name of '${appPath}'. ` +
+            logger_1.log.warn(`Cannot determine the package name of '${appPath}'. ` +
                 `Continuing with the install anyway`);
         }
     }
@@ -353,7 +353,7 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
     };
     switch (appState) {
         case this.APP_INSTALL_STATE.NOT_INSTALLED:
-            logger_js_1.log.debug(`Installing '${appPath}'`);
+            logger_1.log.debug(`Installing '${appPath}'`);
             await this.install(appPath, { ...options, replace: false });
             return {
                 appState,
@@ -361,11 +361,11 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
             };
         case this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED:
             if (enforceCurrentBuild) {
-                logger_js_1.log.info(`Downgrading '${pkg}' as requested`);
+                logger_1.log.info(`Downgrading '${pkg}' as requested`);
                 await uninstallPackage();
                 break;
             }
-            logger_js_1.log.debug(`There is no need to downgrade '${pkg}'`);
+            logger_1.log.debug(`There is no need to downgrade '${pkg}'`);
             return {
                 appState,
                 wasUninstalled,
@@ -374,16 +374,16 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
             if (enforceCurrentBuild) {
                 break;
             }
-            logger_js_1.log.debug(`There is no need to install/upgrade '${appPath}'`);
+            logger_1.log.debug(`There is no need to install/upgrade '${appPath}'`);
             return {
                 appState,
                 wasUninstalled,
             };
         case this.APP_INSTALL_STATE.OLDER_VERSION_INSTALLED:
-            logger_js_1.log.debug(`Executing upgrade of '${appPath}'`);
+            logger_1.log.debug(`Executing upgrade of '${appPath}'`);
             break;
         default:
-            logger_js_1.log.debug(`The current install state of '${appPath}' is unknown. Installing anyway`);
+            logger_1.log.debug(`The current install state of '${appPath}' is unknown. Installing anyway`);
             break;
     }
     try {
@@ -391,7 +391,7 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
     }
     catch (err) {
         const error = err;
-        logger_js_1.log.warn(`Cannot install/upgrade '${pkg}' because of '${error.message}'. Trying full reinstall`);
+        logger_1.log.warn(`Cannot install/upgrade '${pkg}' because of '${error.message}'. Trying full reinstall`);
         await uninstallPackage();
         await this.install(appPath, { ...options, replace: false });
     }
@@ -411,9 +411,9 @@ async function installOrUpgrade(appPath, pkg = null, options = {}) {
  * will be undefined.
  */
 async function extractStringsFromApk(appPath, language = null, outRoot = null) {
-    logger_js_1.log.debug(`Extracting strings from for language: ${language || 'default'}`);
+    logger_1.log.debug(`Extracting strings from for language: ${language || 'default'}`);
     const originalAppPath = appPath;
-    if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
+    if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
         appPath = await this.extractLanguageApk(appPath, language);
     }
     let apkStrings = {};
@@ -438,7 +438,7 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
     }
     catch (e) {
         const err = e;
-        logger_js_1.log.debug('Cannot extract resources using aapt. Trying aapt2. ' +
+        logger_1.log.debug('Cannot extract resources using aapt. Trying aapt2. ' +
             `Original error: ${err.stderr || err.message}`);
         await this.initAapt2();
         configMarker = await formatConfigMarker(async () => {
@@ -463,11 +463,11 @@ async function extractStringsFromApk(appPath, language = null, outRoot = null) {
         }
     }
     if (lodash_1.default.isEmpty(apkStrings)) {
-        logger_js_1.log.warn(`No strings have been found in '${originalAppPath}' resources ` +
+        logger_1.log.warn(`No strings have been found in '${originalAppPath}' resources ` +
             `for '${configMarker || 'default'}' configuration`);
     }
     else {
-        logger_js_1.log.info(`Successfully extracted ${lodash_1.default.keys(apkStrings).length} strings from ` +
+        logger_1.log.info(`Successfully extracted ${lodash_1.default.keys(apkStrings).length} strings from ` +
             `'${originalAppPath}' resources for '${configMarker || 'default'}' configuration`);
     }
     if (!outRoot) {
@@ -489,11 +489,11 @@ async function getApkInfo(appPath) {
     if (!(await support_1.fs.exists(appPath))) {
         throw new Error(`The file at path ${appPath} does not exist or is not accessible`);
     }
-    if (appPath.endsWith(helpers_js_1.APKS_EXTENSION)) {
+    if (appPath.endsWith(helpers_1.APKS_EXTENSION)) {
         appPath = await this.extractBaseApk(appPath);
     }
     try {
-        const { name, versionCode, versionName } = await helpers_js_1.readPackageManifest.bind(this)(appPath);
+        const { name, versionCode, versionName } = await helpers_1.readPackageManifest.bind(this)(appPath);
         return {
             name,
             versionCode,
@@ -502,7 +502,7 @@ async function getApkInfo(appPath) {
     }
     catch (e) {
         const err = e;
-        logger_js_1.log.warn(`Error '${err.message}' while getting badging info`);
+        logger_1.log.warn(`Error '${err.message}' while getting badging info`);
     }
     return {};
 }
@@ -523,16 +523,16 @@ async function formatConfigMarker(configsGetter, desiredMarker, defaultMarker) {
         configMarker = configMarker.replace('-', '-r');
     }
     const configs = await configsGetter();
-    logger_js_1.log.debug(`Resource configurations: ${JSON.stringify(configs)}`);
+    logger_1.log.debug(`Resource configurations: ${JSON.stringify(configs)}`);
     // Assume the 'en' configuration is the default one
     if (configMarker.toLowerCase().startsWith('en') &&
         !configs.some((x) => x.trim() === configMarker)) {
-        logger_js_1.log.debug(`Resource configuration name '${configMarker}' is unknown. ` +
+        logger_1.log.debug(`Resource configuration name '${configMarker}' is unknown. ` +
             `Replacing it with '${defaultMarker}'`);
         configMarker = defaultMarker;
     }
     else {
-        logger_js_1.log.debug(`Selected configuration: '${configMarker}'`);
+        logger_1.log.debug(`Selected configuration: '${configMarker}'`);
     }
     return configMarker;
 }