appium-adb 9.10.0 → 9.10.3

package/README.md

@@ -38,7 +38,7 @@ By default the functional tests use an avd named `NEXUS_S_18_X86`, with API Leve
 necessary to set `API_LEVEL` as it will be inferred.
 
 ```bash
-gulp e2e-test
+npm run e2e-test
 ```
 
 ## Usage:

package/lib/helpers.js

@@ -5,8 +5,8 @@ import _ from 'lodash';
 import B from 'bluebird';
 import semver from 'semver';
 import os from 'os';
+import _fs from 'fs';
 
-const rootDir = path.resolve(__dirname, process.env.NO_PRECOMPILE ? '..' : '../..');
 const APKS_EXTENSION = '.apks';
 const APK_EXTENSION = '.apk';
 const APK_INSTALL_TIMEOUT = 60000;
@@ -15,6 +15,29 @@ const DEFAULT_ADB_EXEC_TIMEOUT = 20000; // in milliseconds
 const MAIN_ACTION = 'android.intent.action.MAIN';
 const LAUNCHER_CATEGORY = 'android.intent.category.LAUNCHER';
 
+/**
+ * Calculates the path to the current module's root folder
+ *
+ * @returns {string} The full path to module root
+ * @throws {Error} If the current module root folder cannot be determined
+ */
+const getModuleRoot = _.memoize(function getModuleRoot () {
+  const pathParts = path.resolve(__dirname).split(path.sep);
+  for (let pathItemIdx = pathParts.length; pathItemIdx > 0; --pathItemIdx) {
+    const currentDir = path.join(...(pathParts.slice(0, pathItemIdx)));
+    const manifestPath = path.join(currentDir, 'package.json');
+    try {
+      if (!_fs.existsSync(manifestPath)) {
+        continue;
+      }
+      if (JSON.parse(_fs.readFileSync(manifestPath, 'utf8')).name === 'appium-adb') {
+        return currentDir;
+      }
+    } catch (ign) {}
+  }
+  throw new Error('Cannot find the root folder of the appium-adb Node.js module');
+});
+
 /**
  * Retrieves the actual path to SDK root folder from the system environment
  *
@@ -1029,11 +1052,11 @@ export {
   getAndroidPlatformAndPath, unzipFile,
   getIMEListFromOutput, getJavaForOs, isShowingLockscreen, isCurrentFocusOnKeyguard,
   getSurfaceOrientation, isScreenOnFully, buildStartCmd, getJavaHome,
-  rootDir, getSdkToolsVersion, getApksignerForOs, getBuildToolsDirs,
+  getSdkToolsVersion, getApksignerForOs, getBuildToolsDirs,
   getApkanalyzerForOs, getOpenSslForOs, extractMatchingPermissions, APKS_EXTENSION,
   APK_INSTALL_TIMEOUT, APKS_INSTALL_TIMEOUT, buildInstallArgs, APK_EXTENSION,
   DEFAULT_ADB_EXEC_TIMEOUT, parseManifest, parseAaptStrings, parseAapt2Strings,
   formatConfigMarker, parseJsonData, unsignApk, toAvdLocaleArgs, requireSdkRoot,
   getSdkRootFromEnv, getAndroidPrefsRoot, dirExists, escapeShellArg,
-  parseLaunchableActivityNames, matchComponentName,
+  parseLaunchableActivityNames, matchComponentName, getModuleRoot
 };

package/lib/tools/apk-signing.js

@@ -6,12 +6,11 @@ import log from '../logger.js';
 import { tempDir, system, mkdirp, fs, util } from '@appium/support';
 import LRU from 'lru-cache';
 import {
-  getJavaForOs, getApksignerForOs, getJavaHome,
-  rootDir, APKS_EXTENSION, unsignApk,
+  getJavaForOs, getApksignerForOs, getJavaHome, getModuleRoot, APKS_EXTENSION, unsignApk,
 } from '../helpers.js';
 
-const DEFAULT_PRIVATE_KEY = path.resolve(rootDir, 'keys', 'testkey.pk8');
-const DEFAULT_CERTIFICATE = path.resolve(rootDir, 'keys', 'testkey.x509.pem');
+const DEFAULT_PRIVATE_KEY = path.resolve(getModuleRoot(), 'keys', 'testkey.pk8');
+const DEFAULT_CERTIFICATE = path.resolve(getModuleRoot(), 'keys', 'testkey.x509.pem');
 const BUNDLETOOL_TUTORIAL = 'https://developer.android.com/studio/command-line/bundletool';
 const APKSIGNER_VERIFY_FAIL = 'DOES NOT VERIFY';
 const SHA1 = 'sha1';

package/lib/tools/system-calls.js

@@ -33,6 +33,7 @@ const SDK_BINARY_ROOTS = [
   '.' // Allow custom sdkRoot to specify full folder path
 ];
 const MIN_DELAY_ADB_API_LEVEL = 28;
+const REQUIRED_SERVICES = ['activity', 'package', 'mount'];
 
 /**
  * Retrieve full path to the given binary.
@@ -951,11 +952,12 @@ systemCallMethods.getVersion = _.memoize(async function getVersion () {
  * @throws {Error} If the emulator is not ready within the given timeout.
  */
 systemCallMethods.waitForEmulatorReady = async function waitForEmulatorReady (timeoutMs = 20000) {
-  const requiredServicesRe = [/\bactivity:\b/, /\bpackage:\b/];
+  const requiredServicesRe = REQUIRED_SERVICES.map((name) => new RegExp(`\\b${name}:`));
+  let services;
   try {
     await waitForCondition(async () => {
       try {
-        const services = await this.shell(['service', 'list']);
+        services = await this.shell(['service', 'list']);
         return requiredServicesRe.every((pattern) => pattern.test(services));
       } catch (err) {
         log.debug(`Waiting for emulator startup. Intermediate error: ${err.message}`);
@@ -966,7 +968,14 @@ systemCallMethods.waitForEmulatorReady = async function waitForEmulatorReady (ti
       intervalMs: 3000,
     });
   } catch (e) {
-    throw new Error(`Emulator is not ready within ${timeoutMs}ms`);
+    if (services) {
+      log.debug(`Recently listed services:\n${services}`);
+    }
+    const missingServices = _.zip(REQUIRED_SERVICES, requiredServicesRe)
+      .filter(([, pattern]) => !pattern.test(services))
+      .map(([name]) => name);
+    throw new Error(`Emulator is not ready within ${timeoutMs}ms ` +
+      `(${missingServices} service${missingServices.length === 1 ? ' is' : 's are'} not running)`);
   }
 };
 

package/package.json

@@ -1,41 +1,47 @@
 {
   "name": "appium-adb",
-  "version": "9.10.0",
+  "version": "9.10.3",
   "description": "Android Debug Bridge interface",
   "main": "./build/index.js",
   "scripts": {
-    "clean": "rm -rf node_modules && rm -f package-lock.json && npm install",
-    "prepare": "gulp prepublish",
-    "test": "gulp once",
-    "watch": "gulp watch",
-    "build": "gulp transpile",
-    "mocha": "mocha",
-    "e2e-test": "gulp transpile && npm run mocha -- -t 600000 --recursive build/test/functional/",
-    "coverage": "gulp coveralls",
+    "build": "rm -rf build && babel --out-dir=build/lib lib && babel --out-dir=build index.js",
+    "dev": "npm run build -- --watch",
+    "lint": "eslint .",
+    "lint:fix": "npm run lint -- --fix",
+    "precommit-lint": "lint-staged",
     "precommit-msg": "echo 'Pre-commit checks...' && exit 0",
-    "precommit-test": "REPORTER=dot gulp once",
-    "lint": "gulp lint",
-    "lint:fix": "gulp eslint --fix"
+    "test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.js\"",
+    "e2e-test": "mocha --exit --timeout 5m \"./test/functional/**/*-specs.js\""
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/appium/appium-adb.git"
   },
-  "author": "",
+  "author": "Appium Contributors",
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/appium/appium-adb/issues"
   },
-  "engines": [
-    "node"
-  ],
+  "engines": {
+    "node": ">=14",
+    "npm": ">=8"
+  },
   "bin": {},
   "directories": {
     "lib": "lib"
   },
+  "lint-staged": {
+    "*.js": [
+      "eslint --fix"
+    ]
+  },
+  "prettier": {
+    "bracketSpacing": false,
+    "printWidth": 100,
+    "singleQuote": true
+  },
   "files": [
     "index.js",
-    "jars",
     "keys",
     "lib",
     "build/index.js",
@@ -54,28 +60,35 @@
     "lru-cache": "^7.3.0",
     "semver": "^7.0.0",
     "source-map-support": "^0.x",
-    "teen_process": "^1.11.0",
+    "teen_process": "^2.0.1",
     "utf7": "^1.0.2"
   },
   "pre-commit": [
     "precommit-msg",
-    "precommit-test"
+    "precommit-lint"
   ],
   "devDependencies": {
-    "@appium/gulp-plugins": "^7.0.0",
     "@appium/eslint-config-appium": "^6.0.0",
-    "@appium/test-support": "^1.0.0",
-    "@babel/core": "^7.16.0",
-    "@babel/eslint-parser": "^7.16.3",
+    "@appium/test-support": "^1.5.0",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/plugin-transform-runtime": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@babel/register": "^7.18.9",
     "@semantic-release/git": "^10.0.1",
+    "babel-plugin-source-map-support": "^2.2.0",
     "chai": "^4.1.0",
     "chai-as-promised": "^7.1.1",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
-    "gulp": "^4.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-promise": "^6.0.0",
+    "lint-staged": "^13.0.3",
     "mocha": "^10.0.0",
-    "mocha-junit-reporter": "^2.0.0",
-    "mocha-multi-reporters": "^1.1.7",
     "pre-commit": "^1.1.3",
+    "prettier": "^2.7.1",
     "semantic-release": "^19.0.2",
     "sinon": "^14.0.0",
     "temp": "^0.x"

package/build/index.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getSdkRootFromEnv = exports.getAndroidBinaryPath = exports.default = exports.DEFAULT_ADB_PORT = exports.ADB = void 0;
-
-require("source-map-support/register");
-
-var adb = _interopRequireWildcard(require("./lib/adb"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-const {
-  ADB,
-  DEFAULT_ADB_PORT,
-  getAndroidBinaryPath,
-  getSdkRootFromEnv
-} = adb;
-exports.getSdkRootFromEnv = getSdkRootFromEnv;
-exports.getAndroidBinaryPath = getAndroidBinaryPath;
-exports.DEFAULT_ADB_PORT = DEFAULT_ADB_PORT;
-exports.ADB = ADB;
-var _default = ADB;
-exports.default = _default;require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbIkFEQiIsIkRFRkFVTFRfQURCX1BPUlQiLCJnZXRBbmRyb2lkQmluYXJ5UGF0aCIsImdldFNka1Jvb3RGcm9tRW52IiwiYWRiIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFFQTs7Ozs7O0FBRUEsTUFBTTtBQUNKQSxFQUFBQSxHQURJO0FBRUpDLEVBQUFBLGdCQUZJO0FBR0pDLEVBQUFBLG9CQUhJO0FBSUpDLEVBQUFBO0FBSkksSUFLRkMsR0FMSjs7Ozs7ZUFPZUosRyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHRyYW5zcGlsZTptYWluXG5cbmltcG9ydCAqIGFzIGFkYiBmcm9tICcuL2xpYi9hZGInO1xuXG5jb25zdCB7XG4gIEFEQixcbiAgREVGQVVMVF9BREJfUE9SVCxcbiAgZ2V0QW5kcm9pZEJpbmFyeVBhdGgsXG4gIGdldFNka1Jvb3RGcm9tRW52XG59ID0gYWRiO1xuXG5leHBvcnQgZGVmYXVsdCBBREI7XG5leHBvcnQgeyBBREIsIERFRkFVTFRfQURCX1BPUlQsIGdldEFuZHJvaWRCaW5hcnlQYXRoLCBnZXRTZGtSb290RnJvbUVudiB9O1xuIl0sImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZVJvb3QiOiIuLiJ9

package/build/lib/adb.js

@@ -1,132 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.DEFAULT_ADB_PORT = exports.ADB = void 0;
-Object.defineProperty(exports, "getAndroidBinaryPath", {
-  enumerable: true,
-  get: function () {
-    return _index.getAndroidBinaryPath;
-  }
-});
-Object.defineProperty(exports, "getSdkRootFromEnv", {
-  enumerable: true,
-  get: function () {
-    return _helpers.getSdkRootFromEnv;
-  }
-});
-
-require("source-map-support/register");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var _os = _interopRequireDefault(require("os"));
-
-var _index = _interopRequireWildcard(require("./tools/index.js"));
-
-var _helpers = require("./helpers");
-
-var _logger = _interopRequireDefault(require("./logger.js"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-const DEFAULT_ADB_PORT = 5037;
-exports.DEFAULT_ADB_PORT = DEFAULT_ADB_PORT;
-const DEFAULT_OPTS = {
-  sdkRoot: (0, _helpers.getSdkRootFromEnv)() || null,
-  udid: null,
-  appDeviceReadyTimeout: null,
-  useKeystore: null,
-  keystorePath: null,
-  keystorePassword: null,
-  keyAlias: null,
-  keyPassword: null,
-  executable: {
-    path: 'adb',
-    defaultArgs: []
-  },
-  tmpDir: _os.default.tmpdir(),
-  curDeviceId: null,
-  emulatorPort: null,
-  logcat: null,
-  binaries: {},
-  instrumentProc: null,
-  suppressKillServer: null,
-  jars: {},
-  adbPort: DEFAULT_ADB_PORT,
-  adbHost: null,
-  adbExecTimeout: _helpers.DEFAULT_ADB_EXEC_TIMEOUT,
-  remoteAppsCacheLimit: 10,
-  buildToolsVersion: null,
-  allowOfflineDevices: false,
-  allowDelayAdb: true
-};
-
-class ADB {
-  constructor(opts = {}) {
-    Object.assign(this, opts);
-
-    _lodash.default.defaultsDeep(this, _lodash.default.cloneDeep(DEFAULT_OPTS));
-
-    if (opts.remoteAdbHost) {
-      this.executable.defaultArgs.push('-H', opts.remoteAdbHost);
-      this.adbHost = opts.remoteAdbHost;
-    }
-
-    if (opts.remoteAdbPort) {
-      this.adbPort = opts.remoteAdbPort;
-    }
-
-    this.executable.defaultArgs.push('-P', this.adbPort);
-  }
-
-  clone(opts = {}) {
-    const originalOptions = _lodash.default.cloneDeep(_lodash.default.pick(this, Object.keys(DEFAULT_OPTS)));
-
-    const cloneOptions = _lodash.default.defaultsDeep(opts, originalOptions);
-
-    const defaultArgs = cloneOptions.executable.defaultArgs;
-
-    if (cloneOptions.remoteAdbHost && defaultArgs.includes('-H')) {
-      defaultArgs.splice(defaultArgs.indexOf('-H'), 2);
-    }
-
-    if (defaultArgs.includes('-P')) {
-      defaultArgs.splice(defaultArgs.indexOf('-P'), 2);
-    }
-
-    return new ADB(cloneOptions);
-  }
-
-}
-
-exports.ADB = ADB;
-
-ADB.createADB = async function createADB(opts) {
-  const adb = new ADB(opts);
-  adb.sdkRoot = await (0, _helpers.requireSdkRoot)(adb.sdkRoot);
-  await adb.getAdbWithCorrectAdbPath();
-
-  try {
-    await adb.adbExec(['start-server']);
-  } catch (e) {
-    _logger.default.warn(e.stderr || e.message);
-  }
-
-  return adb;
-};
-
-for (const [fnName, fn] of _lodash.default.toPairs(_index.default)) {
-  ADB.prototype[fnName] = fn;
-}
-
-var _default = ADB;
-exports.default = _default;require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/adb.js"],"names":["DEFAULT_ADB_PORT","DEFAULT_OPTS","sdkRoot","udid","appDeviceReadyTimeout","useKeystore","keystorePath","keystorePassword","keyAlias","keyPassword","executable","path","defaultArgs","tmpDir","os","tmpdir","curDeviceId","emulatorPort","logcat","binaries","instrumentProc","suppressKillServer","jars","adbPort","adbHost","adbExecTimeout","DEFAULT_ADB_EXEC_TIMEOUT","remoteAppsCacheLimit","buildToolsVersion","allowOfflineDevices","allowDelayAdb","ADB","constructor","opts","Object","assign","_","defaultsDeep","cloneDeep","remoteAdbHost","push","remoteAdbPort","clone","originalOptions","pick","keys","cloneOptions","includes","splice","indexOf","createADB","adb","getAdbWithCorrectAdbPath","adbExec","e","log","warn","stderr","message","fnName","fn","toPairs","methods","prototype"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport os from 'os';\nimport methods, { getAndroidBinaryPath } from './tools/index.js';\nimport {\n  DEFAULT_ADB_EXEC_TIMEOUT, requireSdkRoot, getSdkRootFromEnv\n} from './helpers';\nimport log from './logger.js';\n\nconst DEFAULT_ADB_PORT = 5037;\nconst DEFAULT_OPTS = {\n  sdkRoot: getSdkRootFromEnv() || null,\n  udid: null,\n  appDeviceReadyTimeout: null,\n  useKeystore: null,\n  keystorePath: null,\n  keystorePassword: null,\n  keyAlias: null,\n  keyPassword: null,\n  executable: {path: 'adb', defaultArgs: []},\n  tmpDir: os.tmpdir(),\n  curDeviceId: null,\n  emulatorPort: null,\n  logcat: null,\n  binaries: {},\n  instrumentProc: null,\n  suppressKillServer: null,\n  jars: {},\n  adbPort: DEFAULT_ADB_PORT,\n  adbHost: null,\n  adbExecTimeout: DEFAULT_ADB_EXEC_TIMEOUT,\n  remoteAppsCacheLimit: 10,\n  buildToolsVersion: null,\n  allowOfflineDevices: false,\n  allowDelayAdb: true,\n};\n\nclass ADB {\n  constructor (opts = {}) {\n    Object.assign(this, opts);\n    _.defaultsDeep(this, _.cloneDeep(DEFAULT_OPTS));\n\n    if (opts.remoteAdbHost) {\n      this.executable.defaultArgs.push('-H', opts.remoteAdbHost);\n      this.adbHost = opts.remoteAdbHost;\n    }\n    // TODO figure out why we have this option as it does not appear to be\n    // used anywhere. Probably deprecate in favor of simple opts.adbPort\n    if (opts.remoteAdbPort) {\n      this.adbPort = opts.remoteAdbPort;\n    }\n    this.executable.defaultArgs.push('-P', this.adbPort);\n  }\n\n  /**\n   * Create a new instance of `ADB` that inherits configuration from this `ADB` instance.\n   * This avoids the need to call `ADB.createADB()` multiple times.\n   * @param {object} opts - Additional options mapping to pass to the `ADB` constructor.\n   * @returns {ADB} The resulting class instance.\n   */\n  clone (opts = {}) {\n    const originalOptions = _.cloneDeep(_.pick(this, Object.keys(DEFAULT_OPTS)));\n    const cloneOptions = _.defaultsDeep(opts, originalOptions);\n\n    // Reset default arguments created in the constructor.\n    // Without this code, -H and -P can be injected into defaultArgs multiple times.\n    const defaultArgs = cloneOptions.executable.defaultArgs;\n    if (cloneOptions.remoteAdbHost && defaultArgs.includes('-H')) {\n      defaultArgs.splice(defaultArgs.indexOf('-H'), 2);\n    }\n    if (defaultArgs.includes('-P')) {\n      defaultArgs.splice(defaultArgs.indexOf('-P'), 2);\n    }\n\n    return new ADB(cloneOptions);\n  }\n}\n\nADB.createADB = async function createADB (opts) {\n  const adb = new ADB(opts);\n  adb.sdkRoot = await requireSdkRoot(adb.sdkRoot);\n  await adb.getAdbWithCorrectAdbPath();\n  try {\n    await adb.adbExec(['start-server']);\n  } catch (e) {\n    log.warn(e.stderr || e.message);\n  }\n  return adb;\n};\n\n// add all the methods to the ADB prototype\nfor (const [fnName, fn] of _.toPairs(methods)) {\n  ADB.prototype[fnName] = fn;\n}\n\nexport default ADB;\nexport { ADB, DEFAULT_ADB_PORT, getAndroidBinaryPath, getSdkRootFromEnv };\n"],"file":"lib/adb.js","sourceRoot":"../.."}