appium-adb 9.5.0 → 9.6.0

package/lib/helpers.js

@@ -12,6 +12,8 @@ const APK_EXTENSION = '.apk';
 const APK_INSTALL_TIMEOUT = 60000;
 const APKS_INSTALL_TIMEOUT = APK_INSTALL_TIMEOUT * 2;
 const DEFAULT_ADB_EXEC_TIMEOUT = 20000; // in milliseconds
+const MAIN_ACTION = 'android.intent.action.MAIN';
+const LAUNCHER_CATEGORY = 'android.intent.category.LAUNCHER';
 
 /**
  * Retrieves the actual path to SDK root folder from the system environment
@@ -570,10 +572,8 @@ function parseManifest (manifest) {
         continue;
       }
 
-      const isMainAction = actions
-        .some(({name}) => name === 'android.intent.action.MAIN');
-      const isLauncherCategory = categories
-        .some(({name}) => name === 'android.intent.category.LAUNCHER');
+      const isMainAction = actions.some(({name}) => name === MAIN_ACTION);
+      const isLauncherCategory = categories.some(({name}) => name === LAUNCHER_CATEGORY);
       if (isMainAction && isLauncherCategory) {
         result.activity = activity.name;
         return result;
@@ -930,6 +930,92 @@ function escapeShellArg (arg) {
   return arg.replace(/&/g, '\\&');
 }
 
+/**
+ * Parses the name of launchable package activity
+ * from dumpsys output.
+ *
+ * @param {string} dumpsys the actual dumpsys output
+ * @returns {?string} Either the fully qualified
+ * activity name or null if it cannot be parsed
+ */
+function parseLaunchableActivityName (dumpsys) {
+  const mainActivityNameRe = new RegExp(`^\\s*${_.escapeRegExp(MAIN_ACTION)}:$`);
+  const categoryNameRe = /^\s*Category:\s+"([a-zA-Z0-9._/-]+)"$/;
+  const blocks = [];
+  let blockStartIndent;
+  let block = [];
+  for (const line of dumpsys.split('\n').map(_.trimEnd)) {
+    const currentIndent = line.length - _.trimStart(line).length;
+    if (mainActivityNameRe.test(line)) {
+      blockStartIndent = currentIndent;
+      if (!_.isEmpty(block)) {
+        blocks.push(block);
+        block = [];
+      }
+      continue;
+    }
+    if (_.isNil(blockStartIndent)) {
+      continue;
+    }
+
+    if (currentIndent > blockStartIndent) {
+      block.push(line);
+    } else {
+      if (!_.isEmpty(block)) {
+        blocks.push(block);
+        block = [];
+      }
+      blockStartIndent = null;
+    }
+  }
+  if (!_.isEmpty(block)) {
+    blocks.push(block);
+  }
+
+  for (const item of blocks) {
+    let hasCategory = false;
+    let isLauncherCategory = false;
+    for (const line of item) {
+      const match = categoryNameRe.exec(line);
+      if (!match) {
+        continue;
+      }
+
+      hasCategory = true;
+      isLauncherCategory = match[1] === LAUNCHER_CATEGORY;
+      break;
+    }
+    // On older Android versions the category name
+    // might not be listed, so we just try to fetch
+    // the first match instead
+    if (hasCategory && !isLauncherCategory) {
+      continue;
+    }
+
+    const activityNameStr = _.trim(item[0]);
+    if (!activityNameStr) {
+      continue;
+    }
+    const fqActivityName = activityNameStr.split(/\s+/)[1];
+    if (matchComponentName(fqActivityName)) {
+      return fqActivityName;
+    }
+  }
+  return null;
+}
+
+/**
+ * Check if the given string is a valid component name
+ *
+ * @param {string} classString The string to verify
+ * @return {?Array<Match>} The result of Regexp.exec operation
+ * or _null_ if no matches are found
+ */
+function matchComponentName (classString) {
+  // some.package/some.package.Activity
+  return /^[a-z0-9./_]+$/i.exec(classString);
+}
+
 export {
   getAndroidPlatformAndPath, unzipFile,
   getIMEListFromOutput, getJavaForOs, isShowingLockscreen, isCurrentFocusOnKeyguard,
@@ -940,4 +1026,5 @@ export {
   DEFAULT_ADB_EXEC_TIMEOUT, parseManifest, parseAaptStrings, parseAapt2Strings,
   formatConfigMarker, parseJsonData, unsignApk, toAvdLocaleArgs, requireSdkRoot,
   getSdkRootFromEnv, getAndroidPrefsRoot, dirExists, escapeShellArg,
+  parseLaunchableActivityName, matchComponentName,
 };

package/lib/tools/adb-commands.js

@@ -1,6 +1,7 @@
 import log from '../logger.js';
 import {
   getIMEListFromOutput, getSurfaceOrientation, extractMatchingPermissions,
+  parseLaunchableActivityName, matchComponentName,
 } from '../helpers.js';
 import path from 'path';
 import _ from 'lodash';
@@ -207,7 +208,7 @@ methods.mkdir = async function mkdir (remotePath) {
  */
 methods.isValidClass = function isValidClass (classString) {
   // some.package/some.package.Activity
-  return new RegExp(/^[a-zA-Z0-9./_]+$/).exec(classString);
+  return matchComponentName(classString);
 };
 
 /**
@@ -215,20 +216,26 @@ methods.isValidClass = function isValidClass (classString) {
  * given package. It is expected the package is already installed on
  * the device under test.
  *
- * ! This method only works since Android 7 (API level 24)
- *
  * @param {string} pkg - The target package identifier
  * @return {string} Fully qualified name of the launchable activity
  * @throws {Error} If there was an error while resolving the activity name
  */
 methods.resolveLaunchableActivity = async function resolveLaunchableActivity (pkg) {
+  if (await this.getApiLevel() < 24) {
+    const stdout = await this.shell(['dumpsys', 'package', pkg]);
+    const result = parseLaunchableActivityName(stdout);
+    if (result) {
+      return result;
+    }
+    log.debug(stdout);
+    throw new Error(`Unable to resolve the launchable activity of '${pkg}'. Is it installed on the device?`);
+  }
   const {stdout, stderr} = await this.shell(['cmd', 'package', 'resolve-activity', '--brief', pkg], {
     outputFormat: this.EXEC_OUTPUT_FORMAT.FULL
   });
-  for (const line of (stdout || '').split('\n')) {
-    const trimmedLine = _.trim(line);
-    if (this.isValidClass(trimmedLine)) {
-      return trimmedLine;
+  for (const line of (stdout || '').split('\n').map(_.trim)) {
+    if (this.isValidClass(line)) {
+      return line;
     }
   }
   throw new Error(`Unable to resolve the launchable activity of '${pkg}'. Original error: ${stderr || stdout}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-adb",
-  "version": "9.5.0",
+  "version": "9.6.0",
   "description": "Android Debug Bridge interface",
   "main": "./build/index.js",
   "scripts": {