appium-android-driver 5.14.7 → 6.0.1

package/build/lib/commands/intent.js

@@ -1,21 +1,39 @@
 "use strict";
+// @ts-check
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commands = void 0;
+const mixins_1 = require("./mixins");
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
 const NO_VALUE_ARG_TYPE = 'sn';
 const SUPPORTED_EXTRA_TYPES = [
-    's', NO_VALUE_ARG_TYPE, 'z', 'i', 'l', 'f', 'u', 'cn',
-    'ia', 'ial', 'la', 'lal', 'fa', 'fal', 'sa', 'sal',
+    's',
+    NO_VALUE_ARG_TYPE,
+    'z',
+    'i',
+    'l',
+    'f',
+    'u',
+    'cn',
+    'ia',
+    'ial',
+    'la',
+    'lal',
+    'fa',
+    'fal',
+    'sa',
+    'sal',
 ];
 const API_LEVEL_ANDROID_8 = 26;
-const commands = {};
-exports.commands = commands;
+/**
+ *
+ * @param {import('./types').IntentOpts} opts
+ * @returns {string[]}
+ */
 function parseIntentSpec(opts = {}) {
-    const { intent, action, uri, mimeType, identifier, categories, component, extras, flags, } = opts;
+    const { intent, action, uri, mimeType, identifier, categories, component, extras, flags } = opts;
     const resultArgs = [];
     if (intent) {
         resultArgs.push(intent);
@@ -34,7 +52,7 @@ function parseIntentSpec(opts = {}) {
     }
     if (categories) {
         if (lodash_1.default.isArray(categories)) {
-            resultArgs.push(...(lodash_1.default.flatMap(categories.map((cName) => ['-c', cName]))));
+            resultArgs.push(...lodash_1.default.flatMap(categories.map((cName) => ['-c', cName])));
         }
         else {
             resultArgs.push('-c', categories);
@@ -80,217 +98,87 @@ function parseIntentSpec(opts = {}) {
     return resultArgs;
 }
 /**
- * @typedef {Object} StartActivityOptions
- * @property {?string|number} user ['current'] - The user ID for which the service is started.
- * The `current` user id is used by default
- * @property {?boolean} wait [false] - Set it to `true` if you want to block the method call
- * until the activity manager's process returns the control to the system.
- * @property {?boolean} stop [false] - Set it to `true` to force stop the target
- * app before starting the activity
- * @property {?number|string} windowingMode - The windowing mode to launch the activity into.
- * Check https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/app/WindowConfiguration.java
- * for more details on possible windowing modes (constants starting with `WINDOWING_MODE_`).
- * @property {?number|string} activityType - The activity type to launch the activity as.
- * Check https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/app/WindowConfiguration.java
- * for more details on possible activity types (constants starting with `ACTIVITY_TYPE_`).
- * @property {?number|string} display - The display identifier to launch the activity into.
- * @property {?string} intent - The name of the activity intent to start, for example
- * `com.some.package.name/.YourServiceSubClassName`
- * @property {?string} action - Action name
- * @property {?string} package - Package name
- * @property {?string} uri - Unified resource identifier
- * @property {?string} mimeType - Mime type
- * @property {?string} identifier - Optional identifier
- * @property {?string|Array<string>} categories - One or more category names
- * @property {?string} component - Component name
- * @property {Array<string|Array<string>>} extras - Optional intent arguments. Must be represented
- * as array of arrays, where each subarray item contains two or three string items:
- * value type, key name and the value itself.
- * Supported value types are:
- * - s: string. Value must be a valid string
- * - sn: null. Value is ignored for this type
- * - z: boolean. Value must be either `true` or `false`
- * - i: integer. Value must be a valid 4-byte integer number
- * - l: long. Value must be a valid 8-byte long number
- * - f: float: Value must be a valid float number
- * - u: uri. Value must be a valid uniform resource identifier string
- * - cn: component name. Value must be a valid component name string
- * - ia: Integer[]. Value must be a string of comma-separated integers
- * - ial: List<Integer>. Value must be a string of comma-separated integers
- * - la: Long[]. Value must be a string of comma-separated long numbers
- * - lal: List<Long>. Value must be a string of comma-separated long numbers
- * - fa: Float[]. Value must be a string of comma-separated float numbers
- * - fal: List<Float>. Value must be a string of comma-separated float numbers
- * - sa: String[]. Value must be comma-separated strings. To embed a comma into a string,
- * escape it using "\,"
- * - sal: List<String>. Value must be comma-separated strings. To embed a comma into a string,
- * escape it using "\,"
- * For example: [['s', 'varName1', 'My String1'], ['s', 'varName2', 'My String2'], ['ia', 'arrName', '1,2,3,4']]
- * @property {?string} flags - Intent startup-specific flags as a hexadecimal string.
- * See https://developer.android.com/reference/android/content/Intent.html
- * for the list of available flag values (constants starting with FLAG_ACTIVITY_).
- * Flag values could be merged using the logical 'or' operation.
- * For example, 0x10200000 is the combination of two flags:
- * 0x10000000 `FLAG_ACTIVITY_NEW_TASK` | 0x00200000 `FLAG_ACTIVITY_RESET_TASK_IF_NEEDED`
+ * @type {import('./mixins').ActivityMixin & ThisType<import('../driver').AndroidDriver>}
+ * @satisfies {import('@appium/types').ExternalDriver}
  */
-/**
- * Starts the given activity intent.
- *
- * @param {StartActivityOptions} opts
- * @returns {string} The command output
- * @throws {Error} If there was a failure while starting the activity
- * or required options are missing
- */
-commands.mobileStartActivity = async function mobileStartActivity(opts = {}) {
-    const { user, wait, stop, windowingMode, activityType, display, } = opts;
-    const cmd = [
-        'am', (await this.adb.getApiLevel() < API_LEVEL_ANDROID_8) ? 'start' : 'start-activity',
-    ];
-    if (!lodash_1.default.isNil(user)) {
-        cmd.push('--user', user);
-    }
-    if (wait) {
-        cmd.push('-W');
-    }
-    if (stop) {
-        cmd.push('-S');
-    }
-    if (!lodash_1.default.isNil(windowingMode)) {
-        cmd.push('--windowingMode', windowingMode);
-    }
-    if (!lodash_1.default.isNil(activityType)) {
-        cmd.push('--activityType', activityType);
-    }
-    if (!lodash_1.default.isNil(display)) {
-        cmd.push('--display', display);
-    }
-    cmd.push(...(parseIntentSpec(opts)));
-    return await this.adb.shell(cmd);
-};
-/**
- * @typedef {Object} BroadcastOptions
- * @property {?string|number} user ['all'] - The user ID for which the broadcast is sent.
- * The `current` alias assumes the current user ID.
- * @property {?string} receiverPermission - Require receiver to hold the given permission.
- * @property {?boolean} allowBackgroundActivityStarts [false] - Whether the receiver may
- * start activities even if in the background.
- * @property {?string} intent - The name of the intent to broadcast to, for example
- * `com.some.package.name/.YourServiceSubClassName`.
- * @property {?string} action - Action name
- * @property {?string} uri - Unified resource identifier
- * @property {?string} mimeType - Mime type
- * @property {?string} identifier - Optional identifier
- * @property {?string|Array<string>} categories - One or more category names
- * @property {?string} component - Component name
- * @property {?string} package - Package name
- * @property {Array<Array<string>>} extras - Optional intent arguments.
- * See above for the detailed description.
- * @property {?string} flags - Intent startup-specific flags as a hexadecimal string.
- * See above for the detailed description.
- */
-/**
- * Send a broadcast intent.
- *
- * @param {BroadcastOptions} opts
- * @returns {string} The command output
- * @throws {Error} If there was a failure while starting the activity
- * or required options are missing
- */
-commands.mobileBroadcast = async function mobileBroadcast(opts = {}) {
-    const { user, receiverPermission, allowBackgroundActivityStarts, } = opts;
-    const cmd = ['am', 'broadcast'];
-    if (!lodash_1.default.isNil(user)) {
-        cmd.push('--user', user);
-    }
-    if (receiverPermission) {
-        cmd.push('--receiver-permission', receiverPermission);
-    }
-    if (allowBackgroundActivityStarts) {
-        cmd.push('--allow-background-activity-starts');
-    }
-    cmd.push(...(parseIntentSpec(opts)));
-    return await this.adb.shell(cmd);
-};
-/**
- * @typedef {Object} StartServiceOptions
- * @property {?string|number} user ['current'] - The user ID for which the service is started.
- * The `current` user id is used by default
- * @property {?boolean} foreground [false] - Set it to `true` if your service must be
- * started as foreground service. This option is ignored if the API level of the
- * device under test is below 26 (Android 8).
- * @property {?string} intent - The name of the service intent to start, for example
- * `com.some.package.name/.YourServiceSubClassName`.
- * @property {?string} action - Action name
- * @property {?string} uri - Unified resource identifier
- * @property {?string} mimeType - Mime type
- * @property {?string} identifier - Optional identifier
- * @property {?string|Array<string>} categories - One or more category names
- * @property {?string} component - Component name
- * @property {?string} package - Package name
- * @property {Array<Array<string>>} extras - Optional intent arguments.
- * See above for the detailed description.
- * @property {?string} flags - Intent startup-specific flags as a hexadecimal string.
- * See above for the detailed description.
- */
-/**
- * Starts the given service intent.
- *
- * @param {StartServiceOptions} opts
- * @returns {string} The command output
- * @throws {Error} If there was a failure while starting the service
- * or required options are missing
- */
-commands.mobileStartService = async function mobileStartService(opts = {}) {
-    const { user, foreground, } = opts;
-    const cmd = ['am'];
-    if (await this.adb.getApiLevel() < API_LEVEL_ANDROID_8) {
-        cmd.push('startservice');
-    }
-    else {
-        cmd.push(foreground ? 'start-foreground-service' : 'start-service');
-    }
-    if (!lodash_1.default.isNil(user)) {
-        cmd.push('--user', user);
-    }
-    cmd.push(...(parseIntentSpec(opts)));
-    return await this.adb.shell(cmd);
+const ActivityMixin = {
+    async mobileStartActivity(opts = {}) {
+        const { user, wait, stop, windowingMode, activityType, display } = opts;
+        const cmd = [
+            'am',
+            (await /** @type {ADB} */ (this.adb).getApiLevel()) < API_LEVEL_ANDROID_8
+                ? 'start'
+                : 'start-activity',
+        ];
+        if (!lodash_1.default.isNil(user)) {
+            cmd.push('--user', String(user));
+        }
+        if (wait) {
+            cmd.push('-W');
+        }
+        if (stop) {
+            cmd.push('-S');
+        }
+        if (!lodash_1.default.isNil(windowingMode)) {
+            cmd.push('--windowingMode', String(windowingMode));
+        }
+        if (!lodash_1.default.isNil(activityType)) {
+            cmd.push('--activityType', String(activityType));
+        }
+        if (!lodash_1.default.isNil(display)) {
+            cmd.push('--display', String(display));
+        }
+        cmd.push(...parseIntentSpec(opts));
+        return await /** @type {ADB} */ (this.adb).shell(cmd);
+    },
+    async mobileBroadcast(opts = {}) {
+        const { user, receiverPermission, allowBackgroundActivityStarts } = opts;
+        const cmd = ['am', 'broadcast'];
+        if (!lodash_1.default.isNil(user)) {
+            cmd.push('--user', String(user));
+        }
+        if (receiverPermission) {
+            cmd.push('--receiver-permission', receiverPermission);
+        }
+        if (allowBackgroundActivityStarts) {
+            cmd.push('--allow-background-activity-starts');
+        }
+        cmd.push(...parseIntentSpec(opts));
+        return await /** @type {ADB} */ (this.adb).shell(cmd);
+    },
+    async mobileStartService(opts = {}) {
+        const { user, foreground } = opts;
+        const cmd = ['am'];
+        if ((await /** @type {ADB} */ (this.adb).getApiLevel()) < API_LEVEL_ANDROID_8) {
+            cmd.push('startservice');
+        }
+        else {
+            cmd.push(foreground ? 'start-foreground-service' : 'start-service');
+        }
+        if (!lodash_1.default.isNil(user)) {
+            cmd.push('--user', String(user));
+        }
+        cmd.push(...parseIntentSpec(opts));
+        return await /** @type {ADB} */ (this.adb).shell(cmd);
+    },
+    async mobileStopService(opts = {}) {
+        const { user } = opts;
+        const cmd = [
+            'am',
+            (await /** @type {ADB} */ (this.adb).getApiLevel()) < API_LEVEL_ANDROID_8
+                ? 'stopservice'
+                : 'stop-service',
+        ];
+        if (!lodash_1.default.isNil(user)) {
+            cmd.push('--user', String(user));
+        }
+        cmd.push(...parseIntentSpec(opts));
+        return await /** @type {ADB} */ (this.adb).shell(cmd);
+    },
 };
+(0, mixins_1.mixin)(ActivityMixin);
+exports.default = ActivityMixin;
 /**
- * @typedef {Object} StopServiceOptions
- * @property {string|number} user ['current'] - The user ID for which the service is running.
- * The `current` user id is used by default
- * @property {?string} intent - The name of the service intent to stop, for example
- * `com.some.package.name/.YourServiceSubClassName`.
- * @property {?string} action - Action name
- * @property {?string} uri - Unified resource identifier
- * @property {?string} mimeType - Mime type
- * @property {?string} identifier - Optional identifier
- * @property {?string|Array<string>} categories - One or more category names
- * @property {?string} component - Component name
- * @property {?string} package - Package name
- * @property {Array<Array<string>>} extras - Optional intent arguments.
- * See above for the detailed description.
- * @property {?string} flags - See above for the detailed description.
- */
-/**
- * Stops the given service intent.
- *
- * @param {StopServiceOptions} opts
- * @returns {string} The command output
- * @throws {Error} If there was a failure while stopping the service
- * or required options are missing
+ * @typedef {import('appium-adb').ADB} ADB
  */
-commands.mobileStopService = async function mobileStopService(opts = {}) {
-    const { user, } = opts;
-    const cmd = [
-        'am',
-        (await this.adb.getApiLevel() < API_LEVEL_ANDROID_8) ? 'stopservice' : 'stop-service'
-    ];
-    if (!lodash_1.default.isNil(user)) {
-        cmd.push('--user', user);
-    }
-    cmd.push(...(parseIntentSpec(opts)));
-    return await this.adb.shell(cmd);
-};
-exports.default = commands;
 //# sourceMappingURL=intent.js.map

package/build/lib/commands/intent.js.map

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

package/build/lib/commands/keyboard.d.ts

@@ -1,6 +1,7 @@
-export default commands;
-declare namespace commands {
-    function hideKeyboard(): Promise<any>;
-    function isKeyboardShown(): Promise<any>;
-}
+export default KeyboardMixin;
+/**
+ * @type {import('./mixins').KeyboardMixin & ThisType<import('../driver').AndroidDriver>}
+ * @satisfies {import('@appium/types').ExternalDriver}
+ */
+declare const KeyboardMixin: import('./mixins').KeyboardMixin & ThisType<import('../driver').AndroidDriver>;
 //# sourceMappingURL=keyboard.d.ts.map

package/build/lib/commands/keyboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard.d.ts","sourceRoot":"","sources":["../../../lib/commands/keyboard.js"],"names":[],"mappings":";;IAEA,sCAEC;IAED,yCAGC"}
+{"version":3,"file":"keyboard.d.ts","sourceRoot":"","sources":["../../../lib/commands/keyboard.js"],"names":[],"mappings":";AAIA;;;GAGG;AACH,6BAHU,OAAO,UAAU,EAAE,aAAa,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CActF"}

package/build/lib/commands/keyboard.js

@@ -1,12 +1,20 @@
 "use strict";
+// @ts-check
 Object.defineProperty(exports, "__esModule", { value: true });
-const commands = {};
-commands.hideKeyboard = async function hideKeyboard() {
-    return await this.adb.hideKeyboard();
+const mixins_1 = require("./mixins");
+/**
+ * @type {import('./mixins').KeyboardMixin & ThisType<import('../driver').AndroidDriver>}
+ * @satisfies {import('@appium/types').ExternalDriver}
+ */
+const KeyboardMixin = {
+    async hideKeyboard() {
+        return await /** @type {import('appium-adb').ADB} */ (this.adb).hideKeyboard();
+    },
+    async isKeyboardShown() {
+        const { isKeyboardShown } = await /** @type {import('appium-adb').ADB} */ (this.adb).isSoftKeyboardPresent();
+        return isKeyboardShown;
+    },
 };
-commands.isKeyboardShown = async function isKeyboardShown() {
-    const { isKeyboardShown } = await this.adb.isSoftKeyboardPresent();
-    return isKeyboardShown;
-};
-exports.default = commands;
+(0, mixins_1.mixin)(KeyboardMixin);
+exports.default = KeyboardMixin;
 //# sourceMappingURL=keyboard.js.map

package/build/lib/commands/keyboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../../lib/commands/keyboard.js"],"names":[],"mappings":";;AAAA,MAAM,QAAQ,GAAG,EAAE,CAAC;AAEpB,QAAQ,CAAC,YAAY,GAAG,KAAK,UAAU,YAAY;IACjD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;AACvC,CAAC,CAAC;AAEF,QAAQ,CAAC,eAAe,GAAG,KAAK,UAAU,eAAe;IACvD,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IACjE,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../../lib/commands/keyboard.js"],"names":[],"mappings":";AAAA,YAAY;;AAEZ,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,aAAa,GAAG;IACpB,KAAK,CAAC,YAAY;QAChB,OAAO,MAAM,uCAAuC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,uCAAuC,CAAC,CACtE,IAAI,CAAC,GAAG,CACT,CAAC,qBAAqB,EAAE,CAAC;QAC1B,OAAO,eAAe,CAAC;IACzB,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC;AAErB,kBAAe,aAAa,CAAC"}

package/build/lib/commands/log.d.ts

@@ -1,45 +1,8 @@
-export default extensions;
-export namespace commands {
-    /**
-     * Starts Android logcat broadcast websocket on the same host and port
-     * where Appium server is running at `/ws/session/:sessionId:/appium/logcat` endpoint. The method
-     * will return immediately if the web socket is already listening.
-     *
-     * Each connected websocket listener will receive logcat log lines
-     * as soon as they are visible to Appium.
-     */
-    function mobileStartLogsBroadcast(): Promise<void>;
-    /**
-     * Stops the previously started logcat broadcasting wesocket server.
-     * This method will return immediately if no server is running.
-     */
-    function mobileStopLogsBroadcast(): Promise<void>;
-    function getLogTypes(): Promise<any>;
-    function getLog(logType: any): Promise<any>;
-}
-export let helpers: {};
-declare namespace extensions {
-    namespace supportedLogTypes {
-        namespace logcat {
-            let description: string;
-            function getter(self: any): Promise<any>;
-        }
-        namespace bugreport {
-            let description_1: string;
-            export { description_1 as description };
-            export function getter_1(self: any): Promise<any>;
-            export { getter_1 as getter };
-        }
-        namespace server {
-            let description_2: string;
-            export { description_2 as description };
-            export function getter_2(self: any): {
-                timestamp: any;
-                level: any;
-                message: any;
-            }[];
-            export { getter_2 as getter };
-        }
-    }
-}
+export default LogMixin;
+export type ADB = import('appium-adb').ADB;
+/**
+ * @type {import('./mixins').LogMixin & ThisType<import('../driver').AndroidDriver>}
+ * @satisfies {import('@appium/types').ExternalDriver}
+ */
+declare const LogMixin: import('./mixins').LogMixin & ThisType<import('../driver').AndroidDriver>;
 //# sourceMappingURL=log.d.ts.map

package/build/lib/commands/log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";;IAiDA;;;;;;;OAOG;IACH,mDAmDC;IAED;;;OAGG;IACH,kDASC;IAED,qCAOC;IAED,4CAKC;;AAnIkB,uBAAY;;;;;YAgBnB,yCAA8C;;;;;YAI9C,kDAKP;;;;;;YAIO;;;;gBAQP"}
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.js"],"names":[],"mappings":";kBAsMa,OAAO,YAAY,EAAE,GAAG;AAtKrC;;;GAGG;AACH,wBAHU,OAAO,UAAU,EAAE,QAAQ,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA8JjF"}