appium-adb 14.3.1 → 14.3.3

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

@@ -11,12 +11,12 @@ exports.extractBaseApk = extractBaseApk;
 exports.extractLanguageApk = extractLanguageApk;
 exports.isTestPackageOnlyError = isTestPackageOnlyError;
 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");
 const lru_cache_1 = require("lru-cache");
-const helpers_js_1 = require("../helpers.js");
+const helpers_1 = require("../helpers");
 const async_lock_1 = __importDefault(require("async-lock"));
 const bluebird_1 = __importDefault(require("bluebird"));
 const BASE_APK = 'base-master.apk';
@@ -27,66 +27,23 @@ const APKS_CACHE = new lru_cache_1.LRUCache({
 });
 const APKS_CACHE_GUARD = new async_lock_1.default();
 const BUNDLETOOL_TIMEOUT_MS = 4 * 60 * 1000;
-const APKS_INSTALL_TIMEOUT = helpers_js_1.APK_INSTALL_TIMEOUT * 2;
+const APKS_INSTALL_TIMEOUT = helpers_1.APK_INSTALL_TIMEOUT * 2;
 process.on('exit', () => {
     if (!APKS_CACHE.size) {
         return;
     }
     const paths = [...APKS_CACHE.values()];
-    logger_js_1.log.debug(`Performing cleanup of ${paths.length} cached .apks ` + support_1.util.pluralize('package', paths.length));
+    logger_1.log.debug(`Performing cleanup of ${paths.length} cached .apks ` + support_1.util.pluralize('package', paths.length));
     for (const appPath of paths) {
         try {
             // Asynchronous calls are not supported in onExit handler
             support_1.fs.rimrafSync(appPath);
         }
         catch (e) {
-            logger_js_1.log.warn(e.message);
+            logger_1.log.warn(e.message);
         }
     }
 });
-/**
- * Extracts the particular apks package into a temporary folder,
- * finds and returns the full path to the file contained in this apk.
- * The resulting temporary path, where the .apks file has been extracted,
- * will be stored into the internal LRU cache for better performance.
- *
- * @param apks - The full path to the .apks file
- * @param dstPath - The relative path to the destination file,
- * which is going to be extracted, where each path component is an array item
- * @returns Full path to the extracted file
- * @throws {Error} If the requested item does not exist in the extracted archive or the provides
- * apks file is not a valid bundle
- */
-async function extractFromApks(apks, dstPath) {
-    const normalizedDstPath = lodash_1.default.isArray(dstPath) ? dstPath : [dstPath];
-    return await APKS_CACHE_GUARD.acquire(apks, async () => {
-        // It might be that the original file has been replaced,
-        // so we need to keep the hash sums instead of the actual file paths
-        // as caching keys
-        const apksHash = await support_1.fs.hash(apks);
-        logger_js_1.log.debug(`Calculated '${apks}' hash: ${apksHash}`);
-        if (APKS_CACHE.has(apksHash)) {
-            const cachedRoot = APKS_CACHE.get(apksHash);
-            if (cachedRoot) {
-                const resultPath = node_path_1.default.resolve(cachedRoot, ...normalizedDstPath);
-                if (await support_1.fs.exists(resultPath)) {
-                    return resultPath;
-                }
-            }
-            APKS_CACHE.delete(apksHash);
-        }
-        const tmpRoot = await support_1.tempDir.openDir();
-        logger_js_1.log.debug(`Unpacking application bundle at '${apks}' to '${tmpRoot}'`);
-        await (0, helpers_js_1.unzipFile)(apks, tmpRoot);
-        const resultPath = node_path_1.default.resolve(tmpRoot, ...normalizedDstPath);
-        if (!(await support_1.fs.exists(resultPath))) {
-            throw new Error(`${normalizedDstPath.join(node_path_1.default.sep)} cannot be found in '${apks}' bundle. ` +
-                `Does the archive contain a valid application bundle?`);
-        }
-        APKS_CACHE.set(apksHash, tmpRoot);
-        return resultPath;
-    });
-}
 /**
  * Executes bundletool utility with given arguments and returns the actual stdout
  *
@@ -107,23 +64,23 @@ async function execBundletool(args, errorMsg) {
     if (this.adbHost) {
         env.ANDROID_ADB_SERVER_HOST = this.adbHost;
     }
-    logger_js_1.log.debug(`Executing bundletool with arguments: ${JSON.stringify(args)}`);
+    logger_1.log.debug(`Executing bundletool with arguments: ${JSON.stringify(args)}`);
     let stdout;
     try {
-        ({ stdout } = await (0, teen_process_1.exec)(await (0, helpers_js_1.getJavaForOs)(), args, {
+        ({ stdout } = await (0, teen_process_1.exec)(await (0, helpers_1.getJavaForOs)(), args, {
             env,
             timeout: BUNDLETOOL_TIMEOUT_MS,
         }));
-        logger_js_1.log.debug(`Command stdout: ${lodash_1.default.truncate(stdout, { length: 300 })}`);
+        logger_1.log.debug(`Command stdout: ${lodash_1.default.truncate(stdout, { length: 300 })}`);
         return stdout;
     }
     catch (e) {
         const err = e;
         if (err.stdout) {
-            logger_js_1.log.debug(`Command stdout: ${err.stdout}`);
+            logger_1.log.debug(`Command stdout: ${err.stdout}`);
         }
         if (err.stderr) {
-            logger_js_1.log.debug(`Command stderr: ${err.stderr}`);
+            logger_1.log.debug(`Command stderr: ${err.stderr}`);
         }
         throw new Error(`${errorMsg}. Original error: ${err.message}`);
     }
@@ -144,7 +101,7 @@ async function getDeviceSpec(specLocation) {
         '--output',
         specLocation,
     ];
-    logger_js_1.log.debug(`Getting the spec for the device '${this.curDeviceId}'`);
+    logger_1.log.debug(`Getting the spec for the device '${this.curDeviceId}'`);
     await this.execBundletool(args, 'Cannot retrieve the device spec');
     return specLocation;
 }
@@ -155,7 +112,7 @@ async function getDeviceSpec(specLocation) {
  * @param options - Installation options
  */
 async function installMultipleApks(apkPathsToInstall, options = {}) {
-    const installArgs = (0, helpers_js_1.buildInstallArgs)(await this.getApiLevel(), options);
+    const installArgs = (0, helpers_1.buildInstallArgs)(await this.getApiLevel(), options);
     return await this.adbExec(['install-multiple', ...installArgs, ...apkPathsToInstall], {
         // @ts-ignore This validation works
         timeout: isNaN(Number(options.timeout)) ? undefined : options.timeout,
@@ -224,8 +181,8 @@ async function extractLanguageApk(apks, language = null) {
             return await extractFromApks(apks, ['splits', LANGUAGE_APK(language)]);
         }
         catch (e) {
-            logger_js_1.log.debug(e.message);
-            logger_js_1.log.info(`Assuming that splitting by language is not enabled for the '${apks}' bundle ` +
+            logger_1.log.debug(e.message);
+            logger_1.log.info(`Assuming that splitting by language is not enabled for the '${apks}' bundle ` +
                 `and returning the main apk instead`);
             return await this.extractBaseApk(apks);
         }
@@ -237,7 +194,7 @@ async function extractLanguageApk(apks, language = null) {
         }
         catch { }
     }
-    logger_js_1.log.info(`Cannot find any split apk for the default languages ${JSON.stringify(defaultLanguages)}. ` +
+    logger_1.log.info(`Cannot find any split apk for the default languages ${JSON.stringify(defaultLanguages)}. ` +
         `Returning the main apk instead.`);
     return await this.extractBaseApk(apks);
 }
@@ -249,4 +206,47 @@ async function extractLanguageApk(apks, language = null) {
 function isTestPackageOnlyError(output) {
     return /\[INSTALL_FAILED_TEST_ONLY\]/.test(output);
 }
+/**
+ * Extracts the particular apks package into a temporary folder,
+ * finds and returns the full path to the file contained in this apk.
+ * The resulting temporary path, where the .apks file has been extracted,
+ * will be stored into the internal LRU cache for better performance.
+ *
+ * @param apks - The full path to the .apks file
+ * @param dstPath - The relative path to the destination file,
+ * which is going to be extracted, where each path component is an array item
+ * @returns Full path to the extracted file
+ * @throws {Error} If the requested item does not exist in the extracted archive or the provides
+ * apks file is not a valid bundle
+ */
+async function extractFromApks(apks, dstPath) {
+    const normalizedDstPath = lodash_1.default.isArray(dstPath) ? dstPath : [dstPath];
+    return await APKS_CACHE_GUARD.acquire(apks, async () => {
+        // It might be that the original file has been replaced,
+        // so we need to keep the hash sums instead of the actual file paths
+        // as caching keys
+        const apksHash = await support_1.fs.hash(apks);
+        logger_1.log.debug(`Calculated '${apks}' hash: ${apksHash}`);
+        if (APKS_CACHE.has(apksHash)) {
+            const cachedRoot = APKS_CACHE.get(apksHash);
+            if (cachedRoot) {
+                const resultPath = node_path_1.default.resolve(cachedRoot, ...normalizedDstPath);
+                if (await support_1.fs.exists(resultPath)) {
+                    return resultPath;
+                }
+            }
+            APKS_CACHE.delete(apksHash);
+        }
+        const tmpRoot = await support_1.tempDir.openDir();
+        logger_1.log.debug(`Unpacking application bundle at '${apks}' to '${tmpRoot}'`);
+        await (0, helpers_1.unzipFile)(apks, tmpRoot);
+        const resultPath = node_path_1.default.resolve(tmpRoot, ...normalizedDstPath);
+        if (!(await support_1.fs.exists(resultPath))) {
+            throw new Error(`${normalizedDstPath.join(node_path_1.default.sep)} cannot be found in '${apks}' bundle. ` +
+                `Does the archive contain a valid application bundle?`);
+        }
+        APKS_CACHE.set(apksHash, tmpRoot);
+        return resultPath;
+    });
+}
 //# sourceMappingURL=apks-utils.js.map

package/build/lib/tools/apks-utils.js.map

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

package/build/lib/tools/app-commands.d.ts

@@ -1,6 +1,17 @@
-import type { ADB } from '../adb.js';
-import type { StringRecord, InstallState, ResolveActivityOptions, IsAppInstalledOptions, StartUriOptions, StartAppOptions, AppInfo, PackageActivityInfo, ListInstalledPackagesOptions, ListInstalledPackagesResult } from './types.js';
+import type { ADB } from '../adb';
+import type { StringRecord, InstallState, ResolveActivityOptions, IsAppInstalledOptions, StartUriOptions, StartAppOptions, AppInfo, PackageActivityInfo, ListInstalledPackagesOptions, ListInstalledPackagesResult } from './types';
 export declare const APP_INSTALL_STATE: StringRecord<InstallState>;
+export interface StartCmdOptions {
+    user?: number | string;
+    waitForLaunch?: boolean;
+    pkg?: string;
+    activity?: string;
+    action?: string;
+    category?: string;
+    stopApp?: boolean;
+    flags?: string;
+    optionalIntentArguments?: string;
+}
 /**
  * Verify whether the given argument is a
  * valid class name.
@@ -291,15 +302,4 @@ export declare function listAppProcessIds(this: ADB, pkg: string): Promise<numbe
  * @returns True if the given package is running.
  */
 export declare function isAppRunning(this: ADB, pkg: string): Promise<boolean>;
-export interface StartCmdOptions {
-    user?: number | string;
-    waitForLaunch?: boolean;
-    pkg?: string;
-    activity?: string;
-    action?: string;
-    category?: string;
-    stopApp?: boolean;
-    flags?: string;
-    optionalIntentArguments?: string;
-}
 //# sourceMappingURL=app-commands.d.ts.map

package/build/lib/tools/app-commands.d.ts.map

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

package/build/lib/tools/app-commands.js

@@ -38,7 +38,7 @@ exports.listAppProcessIds = listAppProcessIds;
 exports.isAppRunning = isAppRunning;
 const lodash_1 = __importDefault(require("lodash"));
 const support_1 = require("@appium/support");
-const logger_js_1 = require("../logger.js");
+const logger_1 = require("../logger");
 const asyncbox_1 = require("asyncbox");
 const node_path_1 = __importDefault(require("node:path"));
 // Constants
@@ -55,7 +55,6 @@ const MIN_API_LEVEL_WITH_PERMS_SUPPORT = 23;
 const RESOLVER_ACTIVITY_NAME = 'android/com.android.internal.app.ResolverActivity';
 const MAIN_ACTION = 'android.intent.action.MAIN';
 const LAUNCHER_CATEGORY = 'android.intent.category.LAUNCHER';
-// Public methods
 /**
  * Verify whether the given argument is a
  * valid class name.
@@ -84,7 +83,7 @@ async function resolveLaunchableActivity(pkg, opts = {}) {
         const stdout = await this.shell(['dumpsys', 'package', pkg]);
         const names = parseLaunchableActivityNames(stdout);
         if (lodash_1.default.isEmpty(names)) {
-            logger_js_1.log.debug(stdout);
+            logger_1.log.debug(stdout);
             throw new Error(`Unable to resolve the launchable activity of '${pkg}'. Is it installed on the device?`);
         }
         if (names.length === 1) {
@@ -98,8 +97,8 @@ async function resolveLaunchableActivity(pkg, opts = {}) {
         }
         catch (e) {
             const err = e;
-            logger_js_1.log.debug(err.stack);
-            logger_js_1.log.warn(`Unable to resolve the launchable activity of '${pkg}'. ` +
+            logger_1.log.debug(err.stack);
+            logger_1.log.warn(`Unable to resolve the launchable activity of '${pkg}'. ` +
                 `The very first match of the dumpsys output is going to be used. ` +
                 `Original error: ${err.message}`);
             return names[0];
@@ -184,7 +183,7 @@ async function grantAllPermissions(pkg, apk) {
     }
     catch {
         //avoiding logging error stack, as calling library function would have logged
-        logger_js_1.log.warn(`Ran into problem getting target SDK version; ignoring...`);
+        logger_1.log.warn(`Ran into problem getting target SDK version; ignoring...`);
     }
     if (apiLevel >= MIN_API_LEVEL_WITH_PERMS_SUPPORT &&
         targetSdk >= MIN_API_LEVEL_WITH_PERMS_SUPPORT) {
@@ -198,19 +197,19 @@ async function grantAllPermissions(pkg, apk) {
         const grantedPermissions = await this.getGrantedPermissions(pkg, dumpsysOutput);
         const permissionsToGrant = lodash_1.default.difference(requestedPermissions, grantedPermissions);
         if (lodash_1.default.isEmpty(permissionsToGrant)) {
-            logger_js_1.log.info(`${pkg} contains no permissions available for granting`);
+            logger_1.log.info(`${pkg} contains no permissions available for granting`);
         }
         else {
             await this.grantPermissions(pkg, permissionsToGrant);
         }
     }
     else if (targetSdk < MIN_API_LEVEL_WITH_PERMS_SUPPORT) {
-        logger_js_1.log.info(`It is only possible to grant permissions in runtime for ` +
+        logger_1.log.info(`It is only possible to grant permissions in runtime for ` +
             `apps whose targetSdkVersion in the manifest is set to ${MIN_API_LEVEL_WITH_PERMS_SUPPORT} or above. ` +
             `The current ${pkg} targetSdkVersion is ${targetSdk || 'unset'}.`);
     }
     else if (apiLevel < MIN_API_LEVEL_WITH_PERMS_SUPPORT) {
-        logger_js_1.log.info(`The device's OS API level is ${apiLevel}. ` +
+        logger_1.log.info(`The device's OS API level is ${apiLevel}. ` +
             `It is only possible to grant permissions on devices running Android 6 or above.`);
     }
 }
@@ -228,7 +227,7 @@ async function grantPermissions(pkg, permissions) {
     // trying to grant all permission by forming equivalent command.
     // Also, it is necessary to split long commands into chunks, since the maximum length of
     // adb shell buffer is limited
-    logger_js_1.log.debug(`Granting permissions ${JSON.stringify(permissions)} to '${pkg}'`);
+    logger_1.log.debug(`Granting permissions ${JSON.stringify(permissions)} to '${pkg}'`);
     try {
         await this.shellChunks((perm) => ['pm', 'grant', pkg, perm], permissions);
     }
@@ -285,7 +284,7 @@ async function revokePermission(pkg, permission) {
  * @throws {Error} If there was an error while changing permissions.
  */
 async function getGrantedPermissions(pkg, cmdOutput = null) {
-    logger_js_1.log.debug('Retrieving granted permissions');
+    logger_1.log.debug('Retrieving granted permissions');
     const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
     return extractMatchingPermissions(stdout, ['install', 'runtime'], true);
 }
@@ -298,7 +297,7 @@ async function getGrantedPermissions(pkg, cmdOutput = null) {
  * @returns The list of denied permissions or an empty list.
  */
 async function getDeniedPermissions(pkg, cmdOutput = null) {
-    logger_js_1.log.debug('Retrieving denied permissions');
+    logger_1.log.debug('Retrieving denied permissions');
     const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
     return extractMatchingPermissions(stdout, ['install', 'runtime'], false);
 }
@@ -311,7 +310,7 @@ async function getDeniedPermissions(pkg, cmdOutput = null) {
  * @returns The list of requested permissions or an empty list.
  */
 async function getReqPermissions(pkg, cmdOutput = null) {
-    logger_js_1.log.debug('Retrieving requested permissions');
+    logger_1.log.debug('Retrieving requested permissions');
     const stdout = cmdOutput || (await this.shell(['dumpsys', 'package', pkg]));
     return extractMatchingPermissions(stdout, ['requested']);
 }
@@ -337,7 +336,7 @@ async function stopAndClear(pkg) {
  * @returns The parsed application information.
  */
 async function getPackageInfo(pkg) {
-    logger_js_1.log.debug(`Getting package info for '${pkg}'`);
+    logger_1.log.debug(`Getting package info for '${pkg}'`);
     const result = { name: pkg };
     let stdout;
     try {
@@ -345,8 +344,8 @@ async function getPackageInfo(pkg) {
     }
     catch (err) {
         const error = err;
-        logger_js_1.log.debug(error.stack);
-        logger_js_1.log.warn(`Got an unexpected error while dumping package info: ${error.message}`);
+        logger_1.log.debug(error.stack);
+        logger_1.log.warn(`Got an unexpected error while dumping package info: ${error.message}`);
         return result;
     }
     const installedPattern = new RegExp(`^\\s*Package\\s+\\[${lodash_1.default.escapeRegExp(pkg)}\\][^:]+:$`, 'm');
@@ -381,7 +380,7 @@ async function pullApk(pkg, tmpDir) {
     const remotePath = stdout.replace(packageMarker, '');
     const tmpApp = node_path_1.default.resolve(tmpDir, `${pkg}.apk`);
     await this.pull(remotePath, tmpApp);
-    logger_js_1.log.debug(`Pulled app for package '${pkg}' to '${tmpApp}'`);
+    logger_1.log.debug(`Pulled app for package '${pkg}' to '${tmpApp}'`);
     return tmpApp;
 }
 /**
@@ -393,7 +392,7 @@ async function pullApk(pkg, tmpDir) {
  * @throws {Error} If the app cannot be activated
  */
 async function activateApp(appId) {
-    logger_js_1.log.debug(`Activating '${appId}'`);
+    logger_1.log.debug(`Activating '${appId}'`);
     const apiLevel = await this.getApiLevel();
     // Fallback to Monkey in older APIs
     if (apiLevel < 24) {
@@ -403,21 +402,21 @@ async function activateApp(appId) {
         let output = '';
         try {
             output = await this.shell(cmd);
-            logger_js_1.log.debug(`Command stdout: ${output}`);
+            logger_1.log.debug(`Command stdout: ${output}`);
         }
         catch (e) {
             const error = e;
-            throw logger_js_1.log.errorWithException(`Cannot activate '${appId}'. Original error: ${error.message}`);
+            throw logger_1.log.errorWithException(`Cannot activate '${appId}'. Original error: ${error.message}`);
         }
         if (output.includes('monkey aborted')) {
-            throw logger_js_1.log.errorWithException(`Cannot activate '${appId}'. Are you sure it is installed?`);
+            throw logger_1.log.errorWithException(`Cannot activate '${appId}'. Are you sure it is installed?`);
         }
         return;
     }
     let activityName = await this.resolveLaunchableActivity(appId);
     if (activityName === RESOLVER_ACTIVITY_NAME) {
         // https://github.com/appium/appium/issues/17128
-        logger_js_1.log.debug(`The launchable activity name of '${appId}' was resolved to '${activityName}'. ` +
+        logger_1.log.debug(`The launchable activity name of '${appId}' was resolved to '${activityName}'. ` +
             `Switching the resolver to not use cmd`);
         activityName = await this.resolveLaunchableActivity(appId, { preferCmd: false });
     }
@@ -436,7 +435,7 @@ async function activateApp(appId) {
         '-n',
         activityName,
     ]);
-    logger_js_1.log.debug(stdout);
+    logger_1.log.debug(stdout);
     if (/^error:/im.test(stdout)) {
         throw new Error(`Cannot activate '${appId}'. Original error: ${stdout}`);
     }
@@ -450,7 +449,7 @@ async function activateApp(appId) {
  */
 async function isAppInstalled(pkg, opts = {}) {
     const { user } = opts;
-    logger_js_1.log.debug(`Getting install status for ${pkg}`);
+    logger_1.log.debug(`Getting install status for ${pkg}`);
     let isInstalled;
     if ((await this.getApiLevel()) < 26) {
         try {
@@ -470,7 +469,7 @@ async function isAppInstalled(pkg, opts = {}) {
         const installedPAckages = await this.listInstalledPackages(opts);
         isInstalled = installedPAckages.some((p) => p.appPackage === pkg);
     }
-    logger_js_1.log.debug(`'${pkg}' is${!isInstalled ? ' not' : ''} installed`);
+    logger_1.log.debug(`'${pkg}' is${!isInstalled ? ' not' : ''} installed`);
     return isInstalled;
 }
 /**
@@ -582,7 +581,7 @@ async function startApp(startAppOptions) {
         const stdout = await this.shell(cmd, shellOpts);
         if (stdout.includes('Error: Activity class') && stdout.includes('does not exist')) {
             if (options.retry && options.activity && !options.activity.startsWith('.')) {
-                logger_js_1.log.debug(`We tried to start an activity that doesn't exist, ` +
+                logger_1.log.debug(`We tried to start an activity that doesn't exist, ` +
                     `retrying with '.${options.activity}' activity name`);
                 options.activity = `.${options.activity}`;
                 options.retry = false;
@@ -633,7 +632,7 @@ async function dumpWindows() {
  * @throws {Error} If there is an error while parsing the data.
  */
 async function getFocusedPackageAndActivity() {
-    logger_js_1.log.debug('Getting focused package and activity');
+    logger_1.log.debug('Getting focused package and activity');
     let stdout;
     try {
         stdout = await this.dumpWindows();
@@ -684,7 +683,7 @@ async function getFocusedPackageAndActivity() {
             };
         }
     }
-    logger_js_1.log.debug(stdout);
+    logger_1.log.debug(stdout);
     throw new Error('Could not retrieve the currently focused package and activity');
 }
 /**
@@ -728,11 +727,11 @@ async function waitForActivityOrNot(pkg, activity, waitForStop, waitMs = 20000)
             }
         }
     }
-    logger_js_1.log.debug(`Expected package names to ${waitForStop ? 'not ' : ''}be focused within ${waitMs}ms: ` +
+    logger_1.log.debug(`Expected package names to ${waitForStop ? 'not ' : ''}be focused within ${waitMs}ms: ` +
         allPackages.map((name) => `'${name}'`).join(', '));
     const possibleActivityNames = [...possibleActivityNamesSet];
     const possibleActivityPatterns = possibleActivityNames.map((actName) => new RegExp(`^${actName.replace(/\./g, '\\.').replace(/\*/g, '.*?').replace(/\$/g, '\\$')}$`));
-    logger_js_1.log.debug(`Expected activity name patterns to ${waitForStop ? 'not ' : ''}be focused within ${waitMs}ms: ` +
+    logger_1.log.debug(`Expected activity name patterns to ${waitForStop ? 'not ' : ''}be focused within ${waitMs}ms: ` +
         possibleActivityPatterns.map((name) => `'${name}'`).join(', '));
     const conditionFunc = async () => {
         let appPackage;
@@ -742,20 +741,20 @@ async function waitForActivityOrNot(pkg, activity, waitForStop, waitMs = 20000)
         }
         catch (e) {
             const error = e;
-            logger_js_1.log.debug(error.message);
+            logger_1.log.debug(error.message);
             return false;
         }
         if (appActivity && appPackage) {
-            logger_js_1.log.debug(`Focused package: ${appPackage}`);
+            logger_1.log.debug(`Focused package: ${appPackage}`);
             const fullyQualifiedActivity = toFullyQualifiedActivityName(appActivity.startsWith('.') ? appPackage : '', appActivity);
-            logger_js_1.log.debug(`Focused fully qualified activity name: ${fullyQualifiedActivity}`);
+            logger_1.log.debug(`Focused fully qualified activity name: ${fullyQualifiedActivity}`);
             const isFound = lodash_1.default.includes(allPackages, appPackage) &&
                 possibleActivityPatterns.some((p) => p.test(fullyQualifiedActivity));
             if ((!waitForStop && isFound) || (waitForStop && !isFound)) {
                 return true;
             }
         }
-        logger_js_1.log.debug('None of the expected package/activity combinations matched to the currently focused one. Retrying');
+        logger_1.log.debug('None of the expected package/activity combinations matched to the currently focused one. Retrying');
         return false;
     };
     try {
@@ -967,7 +966,7 @@ function extractMatchingPermissions(dumpsysOutput, groupNames, grantedState = nu
     const filteredResult = result
         .filter((item) => !lodash_1.default.isBoolean(grantedState) || item.granted === grantedState)
         .map((item) => item.permission);
-    logger_js_1.log.debug(`Retrieved ${support_1.util.pluralize('permission', filteredResult.length, true)} ` +
+    logger_1.log.debug(`Retrieved ${support_1.util.pluralize('permission', filteredResult.length, true)} ` +
         `from ${groupNames} ${support_1.util.pluralize('group', groupNames.length, false)}`);
     return filteredResult;
 }
@@ -981,7 +980,7 @@ async function broadcast(intent) {
     if (!this.isValidClass(intent)) {
         throw new Error(`Invalid intent ${intent}`);
     }
-    logger_js_1.log.debug(`Broadcasting: ${intent}`);
+    logger_1.log.debug(`Broadcasting: ${intent}`);
     await this.shell(['am', 'broadcast', '-a', intent]);
 }
 /**
@@ -991,7 +990,7 @@ async function broadcast(intent) {
  * @returns The list of matched process IDs or an empty list.
  */
 async function listAppProcessIds(pkg) {
-    logger_js_1.log.debug(`Getting IDs of all '${pkg}' package`);
+    logger_1.log.debug(`Getting IDs of all '${pkg}' package`);
     const pidRegex = new RegExp(`ProcessRecord\\{[\\w]+\\s+(\\d+):${lodash_1.default.escapeRegExp(pkg)}\\/`);
     const processesInfo = await this.shell(['dumpsys', 'activity', 'processes']);
     const pids = processesInfo
@@ -1011,7 +1010,6 @@ async function listAppProcessIds(pkg) {
 async function isAppRunning(pkg) {
     return !lodash_1.default.isEmpty(await this.listAppProcessIds(pkg));
 }
-// Private methods
 /**
  * Parses optional intent arguments from a string.
  *