appium-android-driver 7.8.2 → 8.0.0

package/build/lib/commands/system-bars.js

@@ -4,11 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseWindows = exports.parseWindowProperties = void 0;
+exports.parseWindows = exports.parseWindowProperties = exports.mobilePerformStatusBarCommand = exports.getSystemBars = void 0;
 const driver_1 = require("appium/driver");
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
-const mixins_1 = require("./mixins");
 const WINDOW_TITLE_PATTERN = /^\s+Window\s#\d+\sWindow\{[0-9a-f]+\s\w+\s([\w-]+)\}:$/;
 const FRAME_PATTERN = /\bm?[Ff]rame=\[([0-9.-]+),([0-9.-]+)\]\[([0-9.-]+),([0-9.-]+)\]/;
 const VIEW_VISIBILITY_PATTERN = /\bmViewVisibility=(0x[0-9a-fA-F]+)/;
@@ -23,22 +22,78 @@ const DEFAULT_WINDOW_PROPERTIES = {
     width: 0,
     height: 0,
 };
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @returns {Promise<StringRecord>}
+ */
+async function getSystemBars() {
+    /** @type {string} */
+    let stdout;
+    try {
+        stdout = await this.adb.shell(['dumpsys', 'window', 'windows']);
+    }
+    catch (e) {
+        throw new Error(`Cannot retrieve system bars details. Original error: ${ /** @type {Error} */(e).message}`);
+    }
+    return parseWindows.bind(this)(stdout);
+}
+exports.getSystemBars = getSystemBars;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StatusBarCommandOpts} opts
+ * @returns {Promise<string>}
+ */
+async function mobilePerformStatusBarCommand(opts) {
+    const { command } = (0, utils_1.requireArgs)('command', opts);
+    /**
+     *
+     * @param {string} cmd
+     * @param {(() => string[]|string)} [argsCallable]
+     * @returns
+     */
+    const toStatusBarCommandCallable = (cmd, argsCallable) => async () => await this.adb.shell([
+        'cmd',
+        'statusbar',
+        cmd,
+        ...(argsCallable ? lodash_1.default.castArray(argsCallable()) : []),
+    ]);
+    const tileCommandArgsCallable = () => 
+    /** @type {string} */ ((0, utils_1.requireArgs)('component', opts).component);
+    const statusBarCommands = lodash_1.default.fromPairs(
+    /** @type {const} */ ([
+        ['expandNotifications', ['expand-notifications']],
+        ['expandSettings', ['expand-settings']],
+        ['collapse', ['collapse']],
+        ['addTile', ['add-tile', tileCommandArgsCallable]],
+        ['removeTile', ['remove-tile', tileCommandArgsCallable]],
+        ['clickTile', ['click-tile', tileCommandArgsCallable]],
+        ['getStatusIcons', ['get-status-icons']],
+    ]).map(([name, args]) => [name, toStatusBarCommandCallable(args[0], args[1])]));
+    const action = statusBarCommands[command];
+    if (!action) {
+        throw new driver_1.errors.InvalidArgumentError(`The '${command}' status bar command is unknown. Only the following commands ` +
+            `are supported: ${lodash_1.default.keys(statusBarCommands)}`);
+    }
+    return await action();
+}
+exports.mobilePerformStatusBarCommand = mobilePerformStatusBarCommand;
+// #region Internal helpers
 /**
  * Parses window properties from adb dumpsys output
  *
+ * @this {import('../driver').AndroidDriver}
  * @param {string} name The name of the window whose properties are being parsed
  * @param {Array<string>} props The list of particular window property lines.
  * Check the corresponding unit tests for more details on the input format.
- * @param {import('@appium/types').AppiumLogger} [log] Logger instance
  * @returns {WindowProperties} Parsed properties object
  * @throws {Error} If there was an issue while parsing the properties string
  */
-function parseWindowProperties(name, props, log) {
+function parseWindowProperties(name, props) {
     const result = lodash_1.default.cloneDeep(DEFAULT_WINDOW_PROPERTIES);
     const propLines = props.join('\n');
     const frameMatch = FRAME_PATTERN.exec(propLines);
     if (!frameMatch) {
-        log?.debug(propLines);
+        this.log.debug(propLines);
         throw new Error(`Cannot parse the frame size from '${name}' window properties`);
     }
     result.x = parseFloat(frameMatch[1]);
@@ -47,7 +102,7 @@ function parseWindowProperties(name, props, log) {
     result.height = parseFloat(frameMatch[4]) - result.y;
     const visibilityMatch = VIEW_VISIBILITY_PATTERN.exec(propLines);
     if (!visibilityMatch) {
-        log?.debug(propLines);
+        this.log.debug(propLines);
         throw new Error(`Cannot parse the visibility value from '${name}' window properties`);
     }
     result.visible = parseInt(visibilityMatch[1], 16) === VIEW_VISIBLE;
@@ -57,14 +112,14 @@ exports.parseWindowProperties = parseWindowProperties;
 /**
  * Extracts status and navigation bar information from the window manager output.
  *
+ * @this {import('../driver').AndroidDriver}
  * @param {string} lines Output from dumpsys command.
  * Check the corresponding unit tests for more details on the input format.
- * @param {import('@appium/types').AppiumLogger} [log] Logger instance
  * @return {StringRecord} An object containing two items where keys are statusBar and navigationBar,
  * and values are corresponding WindowProperties objects
  * @throws {Error} If no window properties could be parsed
  */
-function parseWindows(lines, log) {
+function parseWindows(lines) {
     /**
      * @type {StringRecord}
      */
@@ -86,17 +141,17 @@ function parseWindows(lines, log) {
         }
     }
     if (lodash_1.default.isEmpty(windows)) {
-        log?.debug(lines);
+        this.log.debug(lines);
         throw new Error('Cannot parse any window information from the dumpsys output');
     }
     /** @type {{statusBar?: WindowProperties, navigationBar?: WindowProperties}} */
     const result = {};
     for (const [name, props] of lodash_1.default.toPairs(windows)) {
         if (name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX)) {
-            result.statusBar = parseWindowProperties(name, props, log);
+            result.statusBar = parseWindowProperties.bind(this)(name, props);
         }
         else if (name.startsWith(NAVIGATION_BAR_WINDOW_NAME_PREFIX)) {
-            result.navigationBar = parseWindowProperties(name, props, log);
+            result.navigationBar = parseWindowProperties.bind(this)(name, props);
         }
     }
     const unmatchedWindows = /** @type {const} */ ([
@@ -104,7 +159,7 @@ function parseWindows(lines, log) {
         ['navigationBar', NAVIGATION_BAR_WINDOW_NAME_PREFIX],
     ]).filter(([name]) => lodash_1.default.isNil(result[name]));
     for (const [window, namePrefix] of unmatchedWindows) {
-        log?.info(`No windows have been found whose title matches to ` +
+        this.log.info(`No windows have been found whose title matches to ` +
             `'${namePrefix}'. Assuming it is invisible. ` +
             `Only the following windows are available: ${lodash_1.default.keys(windows)}`);
         result[window] = lodash_1.default.cloneDeep(DEFAULT_WINDOW_PROPERTIES);
@@ -112,58 +167,7 @@ function parseWindows(lines, log) {
     return result;
 }
 exports.parseWindows = parseWindows;
-/**
- * @type {import('./mixins').SystemBarsMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const SystemBarsMixin = {
-    async getSystemBars() {
-        /** @type {string} */
-        let stdout;
-        try {
-            stdout = await this.adb.shell(['dumpsys', 'window', 'windows']);
-        }
-        catch (e) {
-            throw new Error(`Cannot retrieve system bars details. Original error: ${ /** @type {Error} */(e).message}`);
-        }
-        return parseWindows(stdout, this.log);
-    },
-    async mobilePerformStatusBarCommand(opts) {
-        const { command } = (0, utils_1.requireArgs)('command', opts);
-        /**
-         *
-         * @param {string} cmd
-         * @param {(() => string[]|string)} [argsCallable]
-         * @returns
-         */
-        const toStatusBarCommandCallable = (cmd, argsCallable) => async () => await this.adb.shell([
-            'cmd',
-            'statusbar',
-            cmd,
-            ...(argsCallable ? lodash_1.default.castArray(argsCallable()) : []),
-        ]);
-        const tileCommandArgsCallable = () => 
-        /** @type {string} */ ((0, utils_1.requireArgs)('component', opts).component);
-        const statusBarCommands = lodash_1.default.fromPairs(
-        /** @type {const} */ ([
-            ['expandNotifications', ['expand-notifications']],
-            ['expandSettings', ['expand-settings']],
-            ['collapse', ['collapse']],
-            ['addTile', ['add-tile', tileCommandArgsCallable]],
-            ['removeTile', ['remove-tile', tileCommandArgsCallable]],
-            ['clickTile', ['click-tile', tileCommandArgsCallable]],
-            ['getStatusIcons', ['get-status-icons']],
-        ]).map(([name, args]) => [name, toStatusBarCommandCallable(args[0], args[1])]));
-        const action = statusBarCommands[command];
-        if (!action) {
-            throw new driver_1.errors.InvalidArgumentError(`The '${command}' status bar command is unknown. Only the following commands ` +
-                `are supported: ${lodash_1.default.keys(statusBarCommands)}`);
-        }
-        return await action();
-    },
-};
-(0, mixins_1.mixin)(SystemBarsMixin);
-exports.default = SystemBarsMixin;
+// #endregion
 /**
  * @typedef {import('appium-adb').ADB} ADB
  * @typedef {import('@appium/types').StringRecord} StringRecord

package/build/lib/commands/system-bars.js.map

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

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

@@ -0,0 +1,14 @@
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} [format=MOMENT_FORMAT_ISO8601]
+ * @returns {Promise<string>}
+ */
+export function getDeviceTime(this: import("../driver").AndroidDriver, format?: string | undefined): Promise<string>;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').DeviceTimeOpts} [opts={}]
+ * @returns {Promise<string>}
+ */
+export function mobileGetDeviceTime(this: import("../driver").AndroidDriver, opts?: import("./types").DeviceTimeOpts | undefined): Promise<string>;
+export type ADB = import('appium-adb').ADB;
+//# sourceMappingURL=time.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../lib/commands/time.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,qGAFa,QAAQ,MAAM,CAAC,CAe3B;AAED;;;;GAIG;AACH,mIAFa,QAAQ,MAAM,CAAC,CAI3B;kBAGY,OAAO,YAAY,EAAE,GAAG"}

package/build/lib/commands/time.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mobileGetDeviceTime = exports.getDeviceTime = void 0;
+const moment_1 = __importDefault(require("moment"));
+const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} [format=MOMENT_FORMAT_ISO8601]
+ * @returns {Promise<string>}
+ */
+async function getDeviceTime(format = MOMENT_FORMAT_ISO8601) {
+    this.log.debug('Attempting to capture android device date and time. ' + `The format specifier is '${format}'`);
+    const deviceTimestamp = (await this.adb.shell(['date', '+%Y-%m-%dT%T%z'])).trim();
+    this.log.debug(`Got device timestamp: ${deviceTimestamp}`);
+    const parsedTimestamp = moment_1.default.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');
+    if (!parsedTimestamp.isValid()) {
+        this.log.warn('Cannot parse the returned timestamp. Returning as is');
+        return deviceTimestamp;
+    }
+    // @ts-expect-error private API
+    return parsedTimestamp.utcOffset(parsedTimestamp._tzm || 0).format(format);
+}
+exports.getDeviceTime = getDeviceTime;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').DeviceTimeOpts} [opts={}]
+ * @returns {Promise<string>}
+ */
+async function mobileGetDeviceTime(opts = {}) {
+    return await this.getDeviceTime(opts.format);
+}
+exports.mobileGetDeviceTime = mobileGetDeviceTime;
+/**
+ * @typedef {import('appium-adb').ADB} ADB
+ */
+//# sourceMappingURL=time.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../lib/commands/time.js"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,MAAM,qBAAqB,GAAG,sBAAsB,CAAC;AAErD;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAAC,MAAM,GAAG,qBAAqB;IAChE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,sDAAsD,GAAG,4BAA4B,MAAM,GAAG,CAC/F,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,gBAAM,CAAC,GAAG,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;IAC7E,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE;QAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QACtE,OAAO,eAAe,CAAC;KACxB;IACD,+BAA+B;IAC/B,OAAO,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC7E,CAAC;AAbD,sCAaC;AAED;;;;GAIG;AACI,KAAK,UAAU,mBAAmB,CAAC,IAAI,GAAG,EAAE;IACjD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC;AAFD,kDAEC;AAED;;GAEG"}

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

@@ -1,10 +1,103 @@
-export default TouchMixin;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {string?} [elementId=null]
+ * @param {number?} [x=null]
+ * @param {number?} [y=null]
+ * @param {number} [count=1]
+ * @returns {Promise<void>}
+ */
+export function tap(this: import("../driver").AndroidDriver, elementId?: string | null | undefined, x?: number | null | undefined, y?: number | null | undefined, count?: number | undefined): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} elementId
+ * @param {number} x
+ * @param {number} y
+ * @param {number} duration
+ * @returns {Promise<void>}
+ */
+export function touchLongClick(this: import("../driver").AndroidDriver, elementId: string, x: number, y: number, duration: number): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} elementId
+ * @param {number} x
+ * @param {number} y
+ * @returns {Promise<void>}
+ */
+export function touchDown(this: import("../driver").AndroidDriver, elementId: string, x: number, y: number): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} elementId
+ * @param {number} x
+ * @param {number} y
+ * @returns {Promise<void>}
+ */
+export function touchUp(this: import("../driver").AndroidDriver, elementId: string, x: number, y: number): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} elementId
+ * @param {number} x
+ * @param {number} y
+ * @returns {Promise<void>}
+ */
+export function touchMove(this: import("../driver").AndroidDriver, elementId: string, x: number, y: number): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').SwipeOpts} opts
+ * @returns {Promise<void>}
+ */
+export function doSwipe(this: import("../driver").AndroidDriver, opts: import('./types').SwipeOpts): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').TouchDragAction} opts
+ * @returns {Promise<void>}
+ */
+export function doTouchDrag(this: import("../driver").AndroidDriver, opts: import('./types').TouchDragAction): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').TouchActionKind} action
+ * @param {import('./types').TouchActionOpts} [opts={}]
+ * @returns {Promise<void>}
+ */
+export function doTouchAction(this: import("../driver").AndroidDriver, action: import('./types').TouchActionKind, opts?: import("./types").TouchActionOpts | undefined): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').TouchAction[]} gestures
+ * @returns {Promise<void>}
+ */
+export function performTouch(this: import("../driver").AndroidDriver, gestures: import('./types').TouchAction[]): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').TouchAction[]} actions
+ * @param {string} elementId
+ * @returns {Promise<void>}
+ */
+export function performMultiAction(this: import("../driver").AndroidDriver, actions: import('./types').TouchAction[], elementId: string): Promise<void>;
+/**
+ * @deprecated
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} elementId
+ * @param {import('./types').TouchState[]} states
+ * @returns {Promise<void>}
+ */
+export function doPerformMultiAction(this: import("../driver").AndroidDriver, elementId: string, states: import('./types').TouchState[]): Promise<void>;
+/**
+ * @deprecated
+ * @param {number} number
+ * @param {number} digits
+ * @returns {number}
+ */
+export function truncateDecimals(number: number, digits: number): number;
 export type ADB = import('appium-adb').ADB;
 export type TouchAction = import('./types').TouchAction;
 export type NonReleaseTouchAction = import('./types').NonReleaseTouchAction;
-/**
- * @type {import('./mixins').TouchMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-declare const TouchMixin: import('./mixins').TouchMixin & ThisType<import('../driver').AndroidDriver>;
 //# sourceMappingURL=touch.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"touch.d.ts","sourceRoot":"","sources":["../../../lib/commands/touch.js"],"names":[],"mappings":";kBAyZa,OAAO,YAAY,EAAE,GAAG;0BACxB,OAAO,SAAS,EAAE,WAAW;oCAC7B,OAAO,SAAS,EAAE,qBAAqB;AAjXpD;;;GAGG;AACH,0BAHU,OAAO,UAAU,EAAE,UAAU,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CAuWnF"}
+{"version":3,"file":"touch.d.ts","sourceRoot":"","sources":["../../../lib/commands/touch.js"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,+LAFa,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;;;;GAQG;AACH,mFANW,MAAM,KACN,MAAM,KACN,MAAM,YACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;;;GAOG;AACH,8EALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;;;GAOG;AACH,4EALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;;;GAOG;AACH,8EALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;GAKG;AACH,uEAHW,OAAO,SAAS,EAAE,SAAS,GACzB,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;GAKG;AACH,2EAHW,OAAO,SAAS,EAAE,eAAe,GAC/B,QAAQ,IAAI,CAAC,CAIzB;AAED;;;;;;GAMG;AACH,+EAJW,OAAO,SAAS,EAAE,eAAe,yDAE/B,QAAQ,IAAI,CAAC,CAmCzB;AAED;;;;;GAKG;AACH,gFAHW,OAAO,SAAS,EAAE,WAAW,EAAE,GAC7B,QAAQ,IAAI,CAAC,CAmEzB;AAED;;;;;;GAMG;AACH,qFAJW,OAAO,SAAS,EAAE,WAAW,EAAE,aAC/B,MAAM,GACJ,QAAQ,IAAI,CAAC,CAkBzB;AAED;;;;;;GAMG;AACH,yFAJW,MAAM,UACN,OAAO,SAAS,EAAE,UAAU,EAAE,GAC5B,QAAQ,IAAI,CAAC,CAIzB;AAgBD;;;;;GAKG;AACH,yCAJW,MAAM,UACN,MAAM,GACJ,MAAM,CAQlB;kBA8OY,OAAO,YAAY,EAAE,GAAG;0BACxB,OAAO,SAAS,EAAE,WAAW;oCAC7B,OAAO,SAAS,EAAE,qBAAqB"}