appium-android-driver 6.0.1 → 7.0.1

package/lib/utils.js

@@ -6,16 +6,15 @@ export const ADB_SHELL_FEATURE = 'adb_shell';
 /**
  * Assert the presence of particular keys in the given object
  *
- * @template {Object} T
  * @param {string|string[]} argNames one or more key names
- * @param {T} opts the object to check
- * @returns {T} the same given object
+ * @param {any} opts the object to check
+ * @returns {Record<string, any>} the same given object
  */
-export function requireArgs (argNames, opts = {}) {
+export function requireArgs (argNames, opts) {
   for (const argName of (_.isArray(argNames) ? argNames : [argNames])) {
     if (!_.has(opts, argName)) {
       throw new errors.InvalidArgumentError(`'${argName}' argument must be provided`);
     }
   }
   return opts;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-android-driver",
-  "version": "6.0.1",
+  "version": "7.0.1",
   "description": "Android UiAutomator and Chrome support for Appium",
   "keywords": [
     "appium",
@@ -27,7 +27,6 @@
   "files": [
     "lib",
     "build",
-    "bootstrap/bin/AppiumBootstrap.jar",
     "CHANGELOG.md",
     "!build/test",
     "!build/tsconfig.tsbuildinfo"
@@ -36,7 +35,6 @@
     "build": "tsc -b",
     "clean": "npm run build -- --clean",
     "dev": "npm run build -- --watch",
-    "e2e-test": "mocha --exit --timeout 10m \"./test/functional/**/*-specs.js\"",
     "lint": "eslint .",
     "lint:commit": "commitlint",
     "lint:fix": "npm run lint -- --fix",
@@ -70,10 +68,9 @@
     "portfinder": "^1.0.6",
     "portscanner": "2.2.0",
     "semver": "^7.0.0",
-    "shared-preferences-builder": "^0.x",
     "source-map-support": "^0.x",
     "teen_process": "^2.0.0",
-    "type-fest": "^3.11.1",
+    "type-fest": "^4.4.0",
     "ws": "^8.0.0"
   },
   "devDependencies": {
@@ -119,7 +116,7 @@
     "prettier": "^3.0.1",
     "rimraf": "^5.0.0",
     "semantic-release": "^21.1.0",
-    "sinon": "^15.0.0",
+    "sinon": "^16.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6",
     "xpath": "^0.x"

package/bootstrap/README.md

@@ -1,19 +0,0 @@
-Bootstrap Android
-===
-
-To install the Android Maven dependencies in your local environment, run the following:
-
-* Clone https://github.com/mosabua/maven-android-sdk-deployer into your workstation
-* Set the ANDROID_HOME environment to the location of the Android SDK, eg. `export ANDROID_HOME=/Developer/adt-bundle-mac-x86_64-20130219/sdk/`
-* Run `mvn install -P 4.4` from the `maven-android-sdk-deployer` directory. The build will fail if API 19 and some extra packages are not installed.
-* Please install all sdk and api versions of android for building `maven-android-sdk-deployer`.
-
-You can then compile the bootstrap project by running
-
-    mvn package -P 4.4
-
-If mvn package fails, try deleting your ANDROID_HOME folder and downloading everything again. If it still doesn't work try:
-
-    android-sdk/tools/android update sdk --no-ui --obsolete --force
-
-and then run `mvn clean ; mvn install`

package/build/lib/bootstrap.d.ts

@@ -1,29 +0,0 @@
-/// <reference types="node" />
-export default AndroidBootstrap;
-export class AndroidBootstrap {
-    constructor(adb: any, systemPort?: number, webSocket?: undefined);
-    adb: any;
-    systemPort: number;
-    webSocket: any;
-    set ignoreUnexpectedShutdown(arg: any);
-    get ignoreUnexpectedShutdown(): any;
-    get onUnexpectedShutdown(): B<any>;
-    _onUnexpectedShutdownPromise: B<any> | undefined;
-    start(appPackage: any, disableAndroidWatchers?: boolean, acceptSslCerts?: boolean): Promise<any>;
-    process: any;
-    socketClient: net.Socket | undefined;
-    sendCommand(type: any, extra?: {}): Promise<any>;
-    sendAction(action: any, params?: {}): Promise<any>;
-    shutdown(): Promise<void>;
-    uiAutomator: UiAutomator | null | undefined;
-    init(): Promise<void>;
-    _ignoreUnexpectedShutdown: any;
-}
-export namespace COMMAND_TYPES {
-    let ACTION: string;
-    let SHUTDOWN: string;
-}
-import B from 'bluebird';
-import net from 'net';
-import UiAutomator from './uiautomator';
-//# sourceMappingURL=bootstrap.d.ts.map

package/build/lib/bootstrap.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../lib/bootstrap.js"],"names":[],"mappings":";;AAuCA;IACE,kEAKC;IAJC,SAAc;IACd,mBAA4B;IAC5B,eAA0B;IA4K5B,uCAGC;IAED,oCAEC;IA/KD,mCASC;IANG,iDAEE;IAMN,iGA4EC;IArEG,aAMC;IA6CG,qCAA6D;IAoBrE,iDA4CC;IAED,mDAGC;IAED,0BAaC;IADC,4CAAuB;IAIzB,sBAUC;IAIC,+BAAuC;CAM1C;;;;;cA1Na,UAAU;gBAJR,KAAK;wBADG,eAAe"}

package/build/lib/bootstrap.js

@@ -1,213 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMMAND_TYPES = exports.AndroidBootstrap = void 0;
-const uiautomator_1 = __importDefault(require("./uiautomator"));
-const net_1 = __importDefault(require("net"));
-const path_1 = __importDefault(require("path"));
-const lodash_1 = __importDefault(require("lodash"));
-const driver_1 = require("appium/driver");
-const bluebird_1 = __importDefault(require("bluebird"));
-const support_1 = require("@appium/support");
-const log = support_1.logger.getLogger('AndroidBootstrap');
-const COMMAND_TYPES = {
-    ACTION: 'action',
-    SHUTDOWN: 'shutdown'
-};
-exports.COMMAND_TYPES = COMMAND_TYPES;
-const SEND_COMMAND_TIMEOUT = 1 * 60 * 1000;
-/**
- * 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 = lodash_1.default.memoize(async function getModuleRoot() {
-    let currentDir = path_1.default.dirname(path_1.default.resolve(__filename));
-    let isAtFsRoot = false;
-    while (!isAtFsRoot) {
-        const manifestPath = path_1.default.join(currentDir, 'package.json');
-        try {
-            if (await support_1.fs.exists(manifestPath) &&
-                JSON.parse(await support_1.fs.readFile(manifestPath, 'utf8')).name === 'appium-android-driver') {
-                return currentDir;
-            }
-        }
-        catch (ign) { }
-        currentDir = path_1.default.dirname(currentDir);
-        isAtFsRoot = currentDir.length <= path_1.default.dirname(currentDir).length;
-    }
-    throw new Error('Cannot find the root folder of the appium-android-driver Node.js module');
-});
-class AndroidBootstrap {
-    constructor(adb, systemPort = 4724, webSocket = undefined) {
-        this.adb = adb;
-        this.systemPort = systemPort;
-        this.webSocket = webSocket;
-        this.ignoreUnexpectedShutdown = false;
-    }
-    get onUnexpectedShutdown() {
-        if (!this._onUnexpectedShutdownPromise) {
-            let reject;
-            this._onUnexpectedShutdownPromise = new bluebird_1.default(function _onUnexpectedShutdownPromise(_resolve, _reject) {
-                reject = _reject;
-            });
-            this._onUnexpectedShutdownPromise.cancel = reject;
-        }
-        return this._onUnexpectedShutdownPromise;
-    }
-    async start(appPackage, disableAndroidWatchers = false, acceptSslCerts = false) {
-        try {
-            const startDetector = (s) => /Appium Socket Server Ready/.test(s);
-            const bootstrapJar = path_1.default.resolve(await getModuleRoot(), 'bootstrap', 'bin', 'AppiumBootstrap.jar');
-            await this.init();
-            await this.adb.forwardPort(this.systemPort, 4724);
-            this.process = await this.uiAutomator.start(bootstrapJar, 'io.appium.android.bootstrap.Bootstrap', startDetector, '-e', 'pkg', appPackage, '-e', 'disableAndroidWatchers', disableAndroidWatchers, '-e', 'acceptSslCerts', acceptSslCerts);
-            // process the output
-            this.process.on('output', (stdout, stderr) => {
-                const alertRe = /Emitting system alert message/;
-                if (alertRe.test(stdout)) {
-                    log.debug('Emitting alert message...');
-                    if (this.webSocket) {
-                        this.webSocket.sockets.emit('alert', { message: stdout });
-                    }
-                }
-                // the bootstrap logger wraps its own log lines with
-                // [APPIUM-UIAUTO] ... [APPIUM-UIAUTO]
-                // and leaves actual UiAutomator logs as they are
-                let stdoutLines = (stdout || '').split('\n');
-                const uiautoLog = /\[APPIUM-UIAUTO\](.+)\[\/APPIUM-UIAUTO\]/;
-                for (let line of stdoutLines) {
-                    if (line.trim()) {
-                        if (uiautoLog.test(line)) {
-                            let innerLine = uiautoLog.exec(line)[1].trim();
-                            let logMethod = log.info.bind(log);
-                            // if the bootstrap log considers something debug, log that as
-                            // debug and not info
-                            if (/\[debug\]/.test(innerLine)) {
-                                logMethod = log.debug.bind(log);
-                            }
-                            logMethod(`[BOOTSTRAP LOG] ${innerLine}`);
-                        }
-                        else {
-                            log.debug(`[UIAUTO STDOUT] ${line}`);
-                        }
-                    }
-                }
-                let stderrLines = (stderr || '').split('\n');
-                for (let line of stderrLines) {
-                    if (line.trim()) {
-                        log.debug(`[UIAUTO STDERR] ${line}`);
-                    }
-                }
-            });
-            // only return when the socket client has connected
-            return await new bluebird_1.default((resolve, reject) => {
-                try {
-                    this.socketClient = net_1.default.connect(this.systemPort, '127.0.0.1');
-                    // Windows: the socket errors out when ADB restarts. Let's catch it to avoid crashing.
-                    this.socketClient.on('error', (err) => {
-                        if (!this.ignoreUnexpectedShutdown) {
-                            throw new Error(`Android bootstrap socket crashed: ${err}`);
-                        }
-                    });
-                    this.socketClient.once('connect', () => {
-                        log.info('Android bootstrap socket is now connected');
-                        resolve();
-                    });
-                }
-                catch (err) {
-                    reject(err);
-                }
-            });
-        }
-        catch (err) {
-            log.errorAndThrow(`Error occured while starting AndroidBootstrap. Original error: ${err}`);
-        }
-    }
-    async sendCommand(type, extra = {}) {
-        if (!this.socketClient) {
-            throw new Error('Socket connection closed unexpectedly');
-        }
-        return await new bluebird_1.default((resolve, reject) => {
-            let cmd = Object.assign({ cmd: type }, extra);
-            let cmdJson = `${JSON.stringify(cmd)} \n`;
-            log.debug(`Sending command to android: ${lodash_1.default.truncate(cmdJson, { length: 1000 }).trim()}`);
-            this.socketClient.write(cmdJson);
-            this.socketClient.setEncoding('utf8');
-            let streamData = '';
-            let sendCommandTimeoutHandler = null;
-            this.socketClient.on('data', (data) => {
-                if (sendCommandTimeoutHandler) {
-                    clearTimeout(sendCommandTimeoutHandler);
-                }
-                log.debug('Received command result from bootstrap');
-                try {
-                    streamData = JSON.parse(streamData + data);
-                    // we successfully parsed JSON so we've got all the data,
-                    // remove the socket listener and evaluate
-                    this.socketClient.removeAllListeners('data');
-                    if (streamData.status === 0) {
-                        return resolve(streamData.value);
-                    }
-                    reject((0, driver_1.errorFromCode)(streamData.status, streamData.value));
-                }
-                catch (err) {
-                    if (!lodash_1.default.isString(streamData)) {
-                        log.error('Got an unexpected error inside socket listener');
-                        log.error(err.stack);
-                        return reject((0, driver_1.errorFromCode)(13, err.message));
-                    }
-                    log.debug(`Stream still not complete, waiting up to ${SEND_COMMAND_TIMEOUT}ms for the data to arrive`);
-                    streamData += data;
-                    sendCommandTimeoutHandler = setTimeout(() => {
-                        const errMsg = `Server socket stopped responding. The recent response was '${streamData}'`;
-                        log.error(errMsg);
-                        this.socketClient.removeAllListeners('data');
-                        reject((0, driver_1.errorFromCode)(13, errMsg));
-                    }, SEND_COMMAND_TIMEOUT);
-                }
-            });
-        });
-    }
-    async sendAction(action, params = {}) {
-        let extra = { action, params };
-        return await this.sendCommand(COMMAND_TYPES.ACTION, extra);
-    }
-    async shutdown() {
-        if (!this.uiAutomator) {
-            log.warn('Cannot shut down Android bootstrap; it has already shut down');
-            return;
-        }
-        // remove listners so we don't trigger unexpected shutdown
-        this.uiAutomator.removeAllListeners(uiautomator_1.default.EVENT_CHANGED);
-        if (this.socketClient) {
-            await this.sendCommand(COMMAND_TYPES.SHUTDOWN);
-        }
-        await this.uiAutomator.shutdown();
-        this.uiAutomator = null;
-    }
-    // this helper function makes unit testing easier.
-    async init() {
-        this.uiAutomator = new uiautomator_1.default(this.adb);
-        // Handle unexpected UiAutomator shutdown
-        this.uiAutomator.on(uiautomator_1.default.EVENT_CHANGED, (msg) => {
-            if (msg.state === uiautomator_1.default.STATE_STOPPED) {
-                this.uiAutomator = null;
-                this.onUnexpectedShutdown.cancel(new Error('UiAUtomator shut down unexpectedly'));
-            }
-        });
-    }
-    set ignoreUnexpectedShutdown(ignore) {
-        log.debug(`${ignore ? 'Ignoring' : 'Watching for'} bootstrap disconnect`);
-        this._ignoreUnexpectedShutdown = ignore;
-    }
-    get ignoreUnexpectedShutdown() {
-        return this._ignoreUnexpectedShutdown;
-    }
-}
-exports.AndroidBootstrap = AndroidBootstrap;
-exports.default = AndroidBootstrap;
-//# sourceMappingURL=bootstrap.js.map

package/build/lib/bootstrap.js.map

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

package/build/lib/uiautomator.d.ts

@@ -1,24 +0,0 @@
-/// <reference types="node" />
-export default UiAutomator;
-export class UiAutomator extends events {
-    constructor(adb: any);
-    adb: any;
-    tempPath: string;
-    start(uiAutomatorBinaryPath: any, className: any, startDetector: any, ...extraParams: any[]): Promise<any>;
-    proc: any;
-    shutdown(): Promise<void>;
-    parseJarNameFromPath(binaryPath: any): string;
-    changeState(state: any): void;
-    state: any;
-    killUiAutomatorOnDevice(): Promise<void>;
-}
-export namespace UiAutomator {
-    let EVENT_ERROR: string;
-    let EVENT_CHANGED: string;
-    let STATE_STOPPING: string;
-    let STATE_STOPPED: string;
-    let STATE_STARTING: string;
-    let STATE_ONLINE: string;
-}
-import events from 'events';
-//# sourceMappingURL=uiautomator.d.ts.map

package/build/lib/uiautomator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"uiautomator.d.ts","sourceRoot":"","sources":["../../lib/uiautomator.js"],"names":[],"mappings":";;AAMA;IACE,sBAOC;IAFC,SAAc;IACd,iBAAkC;IAGpC,2GA6CC;IA7BG,UAA2C;IA+B/C,0BAQC;IAED,8CAQC;IAED,8BAIC;IAFC,WAAkB;IAIpB,yCAMC;CAEF;;;;;;;;;mBAjGkB,QAAQ"}

package/build/lib/uiautomator.js

@@ -1,102 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UiAutomator = void 0;
-const events_1 = __importDefault(require("events"));
-const support_1 = require("@appium/support");
-const log = support_1.logger.getLogger('UiAutomator');
-class UiAutomator extends events_1.default.EventEmitter {
-    constructor(adb) {
-        if (!adb) {
-            log.errorAndThrow('adb is required to instantiate UiAutomator');
-        }
-        super();
-        this.adb = adb;
-        this.tempPath = '/data/local/tmp/';
-    }
-    async start(uiAutomatorBinaryPath, className, startDetector, ...extraParams) {
-        let processIsAlive;
-        try {
-            log.debug('Starting UiAutomator');
-            this.changeState(UiAutomator.STATE_STARTING);
-            log.debug('Parsing uiautomator jar');
-            // expecting a path like /ads/ads/foo.jar or \asd\asd\foo.jar
-            let jarName = this.parseJarNameFromPath(uiAutomatorBinaryPath);
-            await this.adb.push(uiAutomatorBinaryPath, this.tempPath);
-            // killing any uiautomator existing processes
-            await this.killUiAutomatorOnDevice();
-            log.debug('Starting UIAutomator');
-            let args = ['shell', 'uiautomator', 'runtest', jarName, '-c', className, ...extraParams];
-            this.proc = this.adb.createSubProcess(args);
-            // handle out-of-bound exit by simply emitting a stopped state
-            this.proc.on('exit', (code, signal) => {
-                processIsAlive = false;
-                // cleanup
-                if (this.state !== UiAutomator.STATE_STOPPED &&
-                    this.state !== UiAutomator.STATE_STOPPING) {
-                    let msg = `UiAutomator exited unexpectedly with code ${code}, ` +
-                        `signal ${signal}`;
-                    log.error(msg);
-                }
-                else if (this.state === UiAutomator.STATE_STOPPING) {
-                    log.debug('UiAutomator shut down normally');
-                }
-                this.changeState(UiAutomator.STATE_STOPPED);
-            });
-            await this.proc.start(startDetector);
-            processIsAlive = true;
-            this.changeState(UiAutomator.STATE_ONLINE);
-            return this.proc;
-        }
-        catch (e) {
-            this.emit(UiAutomator.EVENT_ERROR, e);
-            if (processIsAlive) {
-                await this.killUiAutomatorOnDevice();
-                await this.proc.stop();
-            }
-            log.errorAndThrow(e);
-        }
-    }
-    async shutdown() {
-        log.debug('Shutting down UiAutomator');
-        if (this.state !== UiAutomator.STATE_STOPPED) {
-            this.changeState(UiAutomator.STATE_STOPPING);
-            await this.proc.stop();
-        }
-        await this.killUiAutomatorOnDevice();
-        this.changeState(UiAutomator.STATE_STOPPED);
-    }
-    parseJarNameFromPath(binaryPath) {
-        let reTest = /.*(\/|\\)(.*\.jar)/.exec(binaryPath);
-        if (!reTest) {
-            throw new Error(`Unable to parse jar name from ${binaryPath}`);
-        }
-        let jarName = reTest[2];
-        log.debug(`Found jar name: '${jarName}'`);
-        return jarName;
-    }
-    changeState(state) {
-        log.debug(`Moving to state '${state}'`);
-        this.state = state;
-        this.emit(UiAutomator.EVENT_CHANGED, { state });
-    }
-    async killUiAutomatorOnDevice() {
-        try {
-            await this.adb.killProcessesByName('uiautomator');
-        }
-        catch (e) {
-            log.warn(`Error while killing uiAutomator: ${e}`);
-        }
-    }
-}
-exports.UiAutomator = UiAutomator;
-UiAutomator.EVENT_ERROR = 'uiautomator_error';
-UiAutomator.EVENT_CHANGED = 'stateChanged';
-UiAutomator.STATE_STOPPING = 'stopping';
-UiAutomator.STATE_STOPPED = 'stopped';
-UiAutomator.STATE_STARTING = 'starting';
-UiAutomator.STATE_ONLINE = 'online';
-exports.default = UiAutomator;
-//# sourceMappingURL=uiautomator.js.map

package/build/lib/uiautomator.js.map

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