appium-android-driver 7.8.3 → 8.0.0

package/build/lib/commands/permissions.js

@@ -1,14 +1,13 @@
 "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.mobileGetPermissions = exports.mobileChangePermissions = void 0;
 const driver_1 = require("appium/driver");
 const bluebird_1 = __importDefault(require("bluebird"));
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
-const mixins_1 = require("./mixins");
 const ALL_PERMISSIONS_MAGIC = 'all';
 const PM_ACTION = Object.freeze({
     GRANT: 'grant',
@@ -29,12 +28,66 @@ const PERMISSIONS_TYPE = Object.freeze({
     GRANTED: 'granted',
     REQUESTED: 'requested',
 });
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').ChangePermissionsOpts} opts
+ * @returns {Promise<void>}
+ */
+async function mobileChangePermissions(opts) {
+    const { permissions, appPackage = this.opts.appPackage, action = lodash_1.default.toLower(opts.target) === PERMISSION_TARGET.APPOPS
+        ? APPOPS_ACTION.ALLOW
+        : PM_ACTION.GRANT, target = PERMISSION_TARGET.PM, } = opts;
+    if (lodash_1.default.isNil(permissions)) {
+        throw new driver_1.errors.InvalidArgumentError(`'permissions' argument is required`);
+    }
+    if (lodash_1.default.isEmpty(permissions)) {
+        throw new driver_1.errors.InvalidArgumentError(`'permissions' argument must not be empty`);
+    }
+    switch (lodash_1.default.toLower(target)) {
+        case PERMISSION_TARGET.PM:
+            return await changePermissionsViaPm.bind(this)(permissions, appPackage, lodash_1.default.toLower(action));
+        case PERMISSION_TARGET.APPOPS:
+            this.ensureFeatureEnabled(utils_1.ADB_SHELL_FEATURE);
+            return await changePermissionsViaAppops.bind(this)(permissions, appPackage, lodash_1.default.toLower(action));
+        default:
+            throw new driver_1.errors.InvalidArgumentError(`'target' argument must be one of: ${lodash_1.default.values(PERMISSION_TARGET)}`);
+    }
+}
+exports.mobileChangePermissions = mobileChangePermissions;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').GetPermissionsOpts} [opts={}]
+ * @returns {Promise<string[]>}
+ */
+async function mobileGetPermissions(opts = {}) {
+    const { type = PERMISSIONS_TYPE.REQUESTED, appPackage = this.opts.appPackage } = opts;
+    /**
+     * @type {(pkg: string) => Promise<string[]>}
+     */
+    let actionFunc;
+    switch (lodash_1.default.toLower(type)) {
+        case PERMISSIONS_TYPE.REQUESTED:
+            actionFunc = (pkg) => this.adb.getReqPermissions(pkg);
+            break;
+        case PERMISSIONS_TYPE.GRANTED:
+            actionFunc = (pkg) => this.adb.getGrantedPermissions(pkg);
+            break;
+        case PERMISSIONS_TYPE.DENIED:
+            actionFunc = (pkg) => this.adb.getDeniedPermissions(pkg);
+            break;
+        default:
+            throw new driver_1.errors.InvalidArgumentError(`Unknown permissions type '${type}'. ` +
+                `Only ${JSON.stringify(lodash_1.default.values(PERMISSIONS_TYPE))} types are supported`);
+    }
+    return await actionFunc(/** @type {string} */ (appPackage));
+}
+exports.mobileGetPermissions = mobileGetPermissions;
+// #region Internal helpers
 /**
  * @this {AndroidDriver}
- * @param {*} permissions
- * @param {*} appPackage
- * @param {*} action
- * @todo FIXME: type this
+ * @param {string|string[]} permissions
+ * @param {string} appPackage
+ * @param {import('type-fest').ValueOf<PM_ACTION>} action
  */
 async function changePermissionsViaPm(permissions, appPackage, action) {
     if (!lodash_1.default.values(PM_ACTION).includes(action)) {
@@ -42,7 +95,7 @@ async function changePermissionsViaPm(permissions, appPackage, action) {
             `Only ${JSON.stringify(lodash_1.default.values(PM_ACTION))} actions are supported`);
     }
     let affectedPermissions = lodash_1.default.isArray(permissions) ? permissions : [permissions];
-    if (lodash_1.default.toLower(permissions) === ALL_PERMISSIONS_MAGIC) {
+    if (lodash_1.default.isString(permissions) && lodash_1.default.toLower(permissions) === ALL_PERMISSIONS_MAGIC) {
         const dumpsys = await this.adb.shell(['dumpsys', 'package', appPackage]);
         const grantedPermissions = await this.adb.getGrantedPermissions(appPackage, dumpsys);
         if (action === PM_ACTION.GRANT) {
@@ -66,17 +119,16 @@ async function changePermissionsViaPm(permissions, appPackage, action) {
 }
 /**
  * @this {AndroidDriver}
- * @param {*} permissions
- * @param {*} appPackage
- * @param {*} action
- * @todo FIXME: type this
+ * @param {string|string[]} permissions
+ * @param {string} appPackage
+ * @param {import('type-fest').ValueOf<APPOPS_ACTION>} action
  */
 async function changePermissionsViaAppops(permissions, appPackage, action) {
     if (!lodash_1.default.values(APPOPS_ACTION).includes(action)) {
         throw new driver_1.errors.InvalidArgumentError(`Unknown action '${action}'. ` +
             `Only ${JSON.stringify(lodash_1.default.values(APPOPS_ACTION))} actions are supported`);
     }
-    if (lodash_1.default.toLower(permissions) === ALL_PERMISSIONS_MAGIC) {
+    if (lodash_1.default.isString(permissions) && lodash_1.default.toLower(permissions) === ALL_PERMISSIONS_MAGIC) {
         throw new driver_1.errors.InvalidArgumentError(`'${ALL_PERMISSIONS_MAGIC}' permission is only supported for ` +
             `'${PERMISSION_TARGET.PM}' target. ` +
             `Check AppOpsManager.java from Android platform sources to get the full list of supported AppOps permissions`);
@@ -84,56 +136,7 @@ async function changePermissionsViaAppops(permissions, appPackage, action) {
     const promises = (lodash_1.default.isArray(permissions) ? permissions : [permissions]).map((permission) => this.adb.shell(['appops', 'set', appPackage, permission, action]));
     await bluebird_1.default.all(promises);
 }
-/**
- * @type {import('./mixins').PermissionsMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const PermissionsMixin = {
-    async mobileChangePermissions(opts) {
-        const { permissions, appPackage = this.opts.appPackage, action = lodash_1.default.toLower(opts.target) === PERMISSION_TARGET.APPOPS
-            ? APPOPS_ACTION.ALLOW
-            : PM_ACTION.GRANT, target = PERMISSION_TARGET.PM, } = opts;
-        if (lodash_1.default.isNil(permissions)) {
-            throw new driver_1.errors.InvalidArgumentError(`'permissions' argument is required`);
-        }
-        if (lodash_1.default.isEmpty(permissions)) {
-            throw new driver_1.errors.InvalidArgumentError(`'permissions' argument must not be empty`);
-        }
-        switch (lodash_1.default.toLower(target)) {
-            case PERMISSION_TARGET.PM:
-                return await changePermissionsViaPm.bind(this)(permissions, appPackage, lodash_1.default.toLower(action));
-            case PERMISSION_TARGET.APPOPS:
-                this.ensureFeatureEnabled(utils_1.ADB_SHELL_FEATURE);
-                return await changePermissionsViaAppops.bind(this)(permissions, appPackage, lodash_1.default.toLower(action));
-            default:
-                throw new driver_1.errors.InvalidArgumentError(`'target' argument must be one of: ${lodash_1.default.values(PERMISSION_TARGET)}`);
-        }
-    },
-    async mobileGetPermissions(opts = {}) {
-        const { type = PERMISSIONS_TYPE.REQUESTED, appPackage = this.opts.appPackage } = opts;
-        /**
-         * @type {(pkg: string) => Promise<string[]>}
-         */
-        let actionFunc;
-        switch (lodash_1.default.toLower(type)) {
-            case PERMISSIONS_TYPE.REQUESTED:
-                actionFunc = (pkg) => this.adb.getReqPermissions(pkg);
-                break;
-            case PERMISSIONS_TYPE.GRANTED:
-                actionFunc = (pkg) => this.adb.getGrantedPermissions(pkg);
-                break;
-            case PERMISSIONS_TYPE.DENIED:
-                actionFunc = (pkg) => this.adb.getDeniedPermissions(pkg);
-                break;
-            default:
-                throw new driver_1.errors.InvalidArgumentError(`Unknown permissions type '${type}'. ` +
-                    `Only ${JSON.stringify(lodash_1.default.values(PERMISSIONS_TYPE))} types are supported`);
-        }
-        return await actionFunc(/** @type {string} */ (appPackage));
-    },
-};
-(0, mixins_1.mixin)(PermissionsMixin);
-exports.default = PermissionsMixin;
+// #endregion
 /**
  * @typedef {import('appium-adb').ADB} ADB
  * @typedef {import('../driver').AndroidDriver} AndroidDriver

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

@@ -1 +1 @@
-{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../lib/commands/permissions.js"],"names":[],"mappings":";AAAA,YAAY;;;;;AAEZ,0CAAqC;AACrC,wDAAyB;AACzB,oDAAuB;AACvB,oCAA2C;AAC3C,qCAA+B;AAE/B,MAAM,qBAAqB,GAAG,KAAK,CAAC;AACpC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACjB,CAAC,CAAC;AACH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACnB,CAAC,CAAC;AACH,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,EAAE,EAAE,IAAI;IACR,MAAM,EAAE,QAAQ;CACjB,CAAC,CAAC;AACH,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,KAAK,UAAU,sBAAsB,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM;IACnE,IAAI,CAAC,gBAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACzC,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,mBAAmB,MAAM,KAAK;YAC5B,QAAQ,IAAI,CAAC,SAAS,CAAC,gBAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,CACtE,CAAC;KACH;IAED,IAAI,mBAAmB,GAAG,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC/E,IAAI,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,qBAAqB,EAAE;QACpD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;QACzE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACrF,IAAI,MAAM,KAAK,SAAS,CAAC,KAAK,EAAE;YAC9B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC5E,mBAAmB,GAAG,gBAAC,CAAC,UAAU,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;SACvE;aAAM;YACL,mBAAmB,GAAG,kBAAkB,CAAC;SAC1C;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;YAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,gCAAgC,MAAM,EAAE,CAAC,CAAC;YACtE,OAAO;SACR;KACF;IAED,IAAI,MAAM,KAAK,SAAS,CAAC,KAAK,EAAE;QAC9B,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;KAClE;SAAM;QACL,MAAM,kBAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;KAC7F;AACH,CAAC;AACD;;;;;;GAMG;AACH,KAAK,UAAU,0BAA0B,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM;IACvE,IAAI,CAAC,gBAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC7C,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,mBAAmB,MAAM,KAAK;YAC5B,QAAQ,IAAI,CAAC,SAAS,CAAC,gBAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,wBAAwB,CAC1E,CAAC;KACH;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,qBAAqB,EAAE;QACpD,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,IAAI,qBAAqB,qCAAqC;YAC5D,IAAI,iBAAiB,CAAC,EAAE,YAAY;YACpC,6GAA6G,CAChH,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACzF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAClE,CAAC;IACF,MAAM,kBAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC;AAED;;;GAGG;AACH,MAAM,gBAAgB,GAAG;IACvB,KAAK,CAAC,uBAAuB,CAAC,IAAI;QAChC,MAAM,EACJ,WAAW,EACX,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EACjC,MAAM,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,iBAAiB,CAAC,MAAM;YAC1D,CAAC,CAAC,aAAa,CAAC,KAAK;YACrB,CAAC,CAAC,SAAS,CAAC,KAAK,EACnB,MAAM,GAAG,iBAAiB,CAAC,EAAE,GAC9B,GAAG,IAAI,CAAC;QACT,IAAI,gBAAC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACxB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,oCAAoC,CAAC,CAAC;SAC7E;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1B,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,0CAA0C,CAAC,CAAC;SACnF;QAED,QAAQ,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,KAAK,iBAAiB,CAAC,EAAE;gBACvB,OAAO,MAAM,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7F,KAAK,iBAAiB,CAAC,MAAM;gBAC3B,IAAI,CAAC,oBAAoB,CAAC,yBAAiB,CAAC,CAAC;gBAC7C,OAAO,MAAM,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAChD,WAAW,EACX,UAAU,EACV,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAClB,CAAC;YACJ;gBACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,qCAAqC,gBAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CACnE,CAAC;SACL;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAI,GAAG,EAAE;QAClC,MAAM,EAAC,IAAI,GAAG,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QACpF;;WAEG;QACH,IAAI,UAAU,CAAC;QACf,QAAQ,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,KAAK,gBAAgB,CAAC,SAAS;gBAC7B,UAAU,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBACtD,MAAM;YACR,KAAK,gBAAgB,CAAC,OAAO;gBAC3B,UAAU,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;gBAC1D,MAAM;YACR,KAAK,gBAAgB,CAAC,MAAM;gBAC1B,UAAU,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBACzD,MAAM;YACR;gBACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,6BAA6B,IAAI,KAAK;oBACpC,QAAQ,IAAI,CAAC,SAAS,CAAC,gBAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,sBAAsB,CAC3E,CAAC;SACL;QACD,OAAO,MAAM,UAAU,CAAC,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC;AAExB,kBAAe,gBAAgB,CAAC;AAEhC;;;GAGG"}
+{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../lib/commands/permissions.js"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,47 @@
-export default RecordScreenMixin;
-export type ADB = import('appium-adb').ADB;
 /**
- * @type {import('./mixins').RecordScreenMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StartScreenRecordingOpts} [options={}]
+ * @returns {Promise<string>}
+ */
+export function startRecordingScreen(this: import("../driver").AndroidDriver, options?: import("./types").StartScreenRecordingOpts | undefined): Promise<string>;
+export class startRecordingScreen {
+    /**
+     *
+     * @this {import('../driver').AndroidDriver}
+     * @param {import('./types').StartScreenRecordingOpts} [options={}]
+     * @returns {Promise<string>}
+     */
+    constructor(this: import("../driver").AndroidDriver, options?: import("./types").StartScreenRecordingOpts | undefined);
+    _screenRecordingProperties: {
+        timer: timing.Timer;
+        videoSize: string | undefined;
+        timeLimit: string | number;
+        currentTimeLimit: string | number;
+        bitRate: string | number | undefined;
+        bugReport: boolean | undefined;
+        records: never[];
+        recordingProcess: null;
+        stopped: boolean;
+    };
+}
+/**
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StopScreenRecordingOpts} [options={}]
+ * @returns {Promise<string>}
  */
-declare const RecordScreenMixin: import('./mixins').RecordScreenMixin & ThisType<import('../driver').AndroidDriver>;
+export function stopRecordingScreen(this: import("../driver").AndroidDriver, options?: import("./types").StopScreenRecordingOpts | undefined): Promise<string>;
+export class stopRecordingScreen {
+    /**
+     *
+     * @this {import('../driver').AndroidDriver}
+     * @param {import('./types').StopScreenRecordingOpts} [options={}]
+     * @returns {Promise<string>}
+     */
+    constructor(this: import("../driver").AndroidDriver, options?: import("./types").StopScreenRecordingOpts | undefined);
+    _screenRecordingProperties: any;
+}
+export type ADB = import('appium-adb').ADB;
+import { timing } from '@appium/support';
 //# sourceMappingURL=recordscreen.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"recordscreen.d.ts","sourceRoot":"","sources":["../../../lib/commands/recordscreen.js"],"names":[],"mappings":";kBA2Va,OAAO,YAAY,EAAE,GAAG;AAlJrC;;;GAGG;AACH,iCAHU,OAAO,UAAU,EAAE,iBAAiB,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA0I1F"}
+{"version":3,"file":"recordscreen.d.ts","sourceRoot":"","sources":["../../../lib/commands/recordscreen.js"],"names":[],"mappings":"AAiBA;;;;;GAKG;AACH,iJAFa,QAAQ,MAAM,CAAC,CAsD3B;;IA1DD;;;;;OAKG;IACH,uHAoDC;IAxBG;;;;;;;;;;MAA2C;;AA0B/C;;;;;GAKG;AACH,+IAFa,QAAQ,MAAM,CAAC,CAiF3B;;IArFD;;;;;OAKG;IACH,sHA+EC;IAFG,gCAA2C;;kBA4LlC,OAAO,YAAY,EAAE,GAAG;uBA5VgB,iBAAiB"}

package/build/lib/commands/recordscreen.js

@@ -1,15 +1,14 @@
 "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.stopRecordingScreen = exports.startRecordingScreen = void 0;
 const support_1 = require("@appium/support");
 const asyncbox_1 = require("asyncbox");
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const teen_process_1 = require("teen_process");
-const mixins_1 = require("./mixins");
 const RETRY_PAUSE = 300;
 const RETRY_TIMEOUT = 5000;
 const MAX_RECORDING_TIME_SEC = 60 * 3;
@@ -20,6 +19,122 @@ const SCREENRECORD_BINARY = 'screenrecord';
 const DEFAULT_EXT = '.mp4';
 const MIN_EMULATOR_API_LEVEL = 27;
 const FFMPEG_BINARY = `ffmpeg${support_1.system.isWindows() ? '.exe' : ''}`;
+/**
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StartScreenRecordingOpts} [options={}]
+ * @returns {Promise<string>}
+ */
+async function startRecordingScreen(options = {}) {
+    await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
+    let result = '';
+    const { videoSize, timeLimit = DEFAULT_RECORDING_TIME_SEC, bugReport, bitRate, forceRestart, } = options;
+    if (!forceRestart) {
+        result = await this.stopRecordingScreen(options);
+    }
+    if (await terminateBackgroundScreenRecording(this.adb, true)) {
+        this.log.warn(`There were some ${SCREENRECORD_BINARY} process leftovers running ` +
+            `in the background. Make sure you stop screen recording each time after it is started, ` +
+            `otherwise the recorded media might quickly exceed all the free space on the device under test.`);
+    }
+    if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
+        // XXX: this doesn't need to be done in serial, does it?
+        for (const record of this._screenRecordingProperties.records || []) {
+            await this.adb.rimraf(record);
+        }
+        this._screenRecordingProperties = undefined;
+    }
+    const timeout = parseFloat(String(timeLimit));
+    if (isNaN(timeout) || timeout > MAX_TIME_SEC || timeout <= 0) {
+        throw new Error(`The timeLimit value must be in range [1, ${MAX_TIME_SEC}] seconds. ` +
+            `The value of '${timeLimit}' has been passed instead.`);
+    }
+    this._screenRecordingProperties = {
+        timer: new support_1.timing.Timer().start(),
+        videoSize,
+        timeLimit,
+        currentTimeLimit: timeLimit,
+        bitRate,
+        bugReport,
+        records: [],
+        recordingProcess: null,
+        stopped: false,
+    };
+    await scheduleScreenRecord.bind(this)(this._screenRecordingProperties);
+    return result;
+}
+exports.startRecordingScreen = startRecordingScreen;
+/**
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StopScreenRecordingOpts} [options={}]
+ * @returns {Promise<string>}
+ */
+async function stopRecordingScreen(options = {}) {
+    await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
+    if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
+        this._screenRecordingProperties.stopped = true;
+    }
+    try {
+        await terminateBackgroundScreenRecording(this.adb, false);
+    }
+    catch (err) {
+        this.log.warn(/** @type {Error} */ (err).message);
+        if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
+            this.log.warn('The resulting video might be corrupted');
+        }
+    }
+    if (lodash_1.default.isEmpty(this._screenRecordingProperties)) {
+        this.log.info(`Screen recording has not been previously started by Appium. There is nothing to stop`);
+        return '';
+    }
+    if (this._screenRecordingProperties.recordingProcess &&
+        this._screenRecordingProperties.recordingProcess.isRunning) {
+        try {
+            await this._screenRecordingProperties.recordingProcess.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT);
+        }
+        catch (e) {
+            this.log.errorAndThrow(`Unable to stop screen recording within ${PROCESS_SHUTDOWN_TIMEOUT}ms`);
+        }
+        this._screenRecordingProperties.recordingProcess = null;
+    }
+    if (lodash_1.default.isEmpty(this._screenRecordingProperties.records)) {
+        this.log.errorAndThrow(`No screen recordings have been stored on the device so far. ` +
+            `Are you sure the ${SCREENRECORD_BINARY} utility works as expected?`);
+    }
+    const tmpRoot = await support_1.tempDir.openDir();
+    try {
+        const localRecords = [];
+        for (const pathOnDevice of this._screenRecordingProperties.records) {
+            const relativePath = path_1.default.resolve(tmpRoot, path_1.default.posix.basename(pathOnDevice));
+            localRecords.push(relativePath);
+            await this.adb.pull(pathOnDevice, relativePath);
+            await this.adb.rimraf(pathOnDevice);
+        }
+        let resultFilePath = /** @type {string} */ (lodash_1.default.last(localRecords));
+        if (localRecords.length > 1) {
+            this.log.info(`Got ${localRecords.length} screen recordings. Trying to merge them`);
+            try {
+                resultFilePath = await mergeScreenRecords.bind(this)(localRecords);
+            }
+            catch (e) {
+                this.log.warn(`Cannot merge the recorded files. The most recent screen recording is going to be returned as the result. ` +
+                    `Original error: ${ /** @type {Error} */(e).message}`);
+            }
+        }
+        if (lodash_1.default.isEmpty(options.remotePath)) {
+            const { size } = await support_1.fs.stat(resultFilePath);
+            this.log.debug(`The size of the resulting screen recording is ${support_1.util.toReadableSizeString(size)}`);
+        }
+        return await uploadRecordedMedia(resultFilePath, options.remotePath, options);
+    }
+    finally {
+        await support_1.fs.rimraf(tmpRoot);
+        this._screenRecordingProperties = undefined;
+    }
+}
+exports.stopRecordingScreen = stopRecordingScreen;
+// #region Internal helpers
 /**
  *
  * @param {string} localFile
@@ -62,13 +177,11 @@ async function verifyScreenRecordIsSupported(adb, isEmulator) {
     }
 }
 /**
- *
- * @param {ADB} adb
+ * @this {import('../driver').AndroidDriver}
  * @param {import('@appium/types').StringRecord} recordingProperties
- * @param {import('@appium/types').AppiumLogger} [log]
  * @returns {Promise<void>}
  */
-async function scheduleScreenRecord(adb, recordingProperties, log) {
+async function scheduleScreenRecord(recordingProperties) {
     if (recordingProperties.stopped) {
         return;
     }
@@ -81,7 +194,7 @@ async function scheduleScreenRecord(adb, recordingProperties, log) {
         }
     }
     const pathOnDevice = `/sdcard/${support_1.util.uuidV4().substring(0, 8)}${DEFAULT_EXT}`;
-    const recordingProc = adb.screenrecord(pathOnDevice, {
+    const recordingProc = this.adb.screenrecord(pathOnDevice, {
         videoSize,
         bitRate,
         timeLimit: currentTimeLimit,
@@ -92,31 +205,31 @@ async function scheduleScreenRecord(adb, recordingProperties, log) {
             return;
         }
         const currentDuration = timer.getDuration().asSeconds.toFixed(0);
-        log?.debug(`The overall screen recording duration is ${currentDuration}s so far`);
+        this.log.debug(`The overall screen recording duration is ${currentDuration}s so far`);
         const timeLimitInt = parseInt(timeLimit, 10);
         if (isNaN(timeLimitInt) || currentDuration >= timeLimitInt) {
-            log?.debug('There is no need to start the next recording chunk');
+            this.log.debug('There is no need to start the next recording chunk');
             return;
         }
         recordingProperties.currentTimeLimit = timeLimitInt - currentDuration;
         const chunkDuration = recordingProperties.currentTimeLimit < MAX_RECORDING_TIME_SEC
             ? recordingProperties.currentTimeLimit
             : MAX_RECORDING_TIME_SEC;
-        log?.debug(`Starting the next ${chunkDuration}s-chunk ` +
+        this.log.debug(`Starting the next ${chunkDuration}s-chunk ` +
             `of screen recording in order to achieve ${timeLimitInt}s total duration`);
         (async () => {
             try {
-                await scheduleScreenRecord(adb, recordingProperties, log);
+                await scheduleScreenRecord.bind(this)(recordingProperties);
             }
             catch (e) {
-                log?.error(/** @type {Error} */ (e).stack);
+                this.log.error(/** @type {Error} */ (e).stack);
                 recordingProperties.stopped = true;
             }
         })();
     });
     await recordingProc.start(0);
     try {
-        await (0, asyncbox_1.waitForCondition)(async () => await adb.fileExists(pathOnDevice), {
+        await (0, asyncbox_1.waitForCondition)(async () => await this.adb.fileExists(pathOnDevice), {
             waitMs: RETRY_TIMEOUT,
             intervalMs: RETRY_PAUSE,
         });
@@ -130,11 +243,11 @@ async function scheduleScreenRecord(adb, recordingProperties, log) {
 }
 /**
  *
+ * @this {import('../driver').AndroidDriver}
  * @param {string[]} mediaFiles
- * @param {import('@appium/types').AppiumLogger} [log]
  * @returns {Promise<string>}
  */
-async function mergeScreenRecords(mediaFiles, log) {
+async function mergeScreenRecords(mediaFiles) {
     try {
         await support_1.fs.which(FFMPEG_BINARY);
     }
@@ -144,10 +257,10 @@ async function mergeScreenRecords(mediaFiles, log) {
     const configContent = mediaFiles.map((x) => `file '${x}'`).join('\n');
     const configFile = path_1.default.resolve(path_1.default.dirname(mediaFiles[0]), 'config.txt');
     await support_1.fs.writeFile(configFile, configContent, 'utf8');
-    log?.debug(`Generated ffmpeg merging config '${configFile}' with items:\n${configContent}`);
+    this.log.debug(`Generated ffmpeg merging config '${configFile}' with items:\n${configContent}`);
     const result = path_1.default.resolve(path_1.default.dirname(mediaFiles[0]), `merge_${Math.floor(+new Date())}${DEFAULT_EXT}`);
     const args = ['-safe', '0', '-f', 'concat', '-i', configFile, '-c', 'copy', result];
-    log?.info(`Initiating screen records merging using the command '${FFMPEG_BINARY} ${args.join(' ')}'`);
+    this.log.info(`Initiating screen records merging using the command '${FFMPEG_BINARY} ${args.join(' ')}'`);
     await (0, teen_process_1.exec)(FFMPEG_BINARY, args);
     return result;
 }
@@ -174,115 +287,7 @@ async function terminateBackgroundScreenRecording(adb, force = true) {
         throw new Error(`Unable to stop the background screen recording: ${ /** @type {Error} */(err).message}`);
     }
 }
-/**
- * @type {import('./mixins').RecordScreenMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const RecordScreenMixin = {
-    async startRecordingScreen(options = {}) {
-        await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
-        let result = '';
-        const { videoSize, timeLimit = DEFAULT_RECORDING_TIME_SEC, bugReport, bitRate, forceRestart, } = options;
-        if (!forceRestart) {
-            result = await this.stopRecordingScreen(options);
-        }
-        if (await terminateBackgroundScreenRecording(this.adb, true)) {
-            this.log.warn(`There were some ${SCREENRECORD_BINARY} process leftovers running ` +
-                `in the background. Make sure you stop screen recording each time after it is started, ` +
-                `otherwise the recorded media might quickly exceed all the free space on the device under test.`);
-        }
-        if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
-            // XXX: this doesn't need to be done in serial, does it?
-            for (const record of this._screenRecordingProperties.records || []) {
-                await this.adb.rimraf(record);
-            }
-            this._screenRecordingProperties = undefined;
-        }
-        const timeout = parseFloat(String(timeLimit));
-        if (isNaN(timeout) || timeout > MAX_TIME_SEC || timeout <= 0) {
-            throw new Error(`The timeLimit value must be in range [1, ${MAX_TIME_SEC}] seconds. ` +
-                `The value of '${timeLimit}' has been passed instead.`);
-        }
-        this._screenRecordingProperties = {
-            timer: new support_1.timing.Timer().start(),
-            videoSize,
-            timeLimit,
-            currentTimeLimit: timeLimit,
-            bitRate,
-            bugReport,
-            records: [],
-            recordingProcess: null,
-            stopped: false,
-        };
-        await scheduleScreenRecord(this.adb, this._screenRecordingProperties, this.log);
-        return result;
-    },
-    async stopRecordingScreen(options = {}) {
-        await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
-        if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
-            this._screenRecordingProperties.stopped = true;
-        }
-        try {
-            await terminateBackgroundScreenRecording(this.adb, false);
-        }
-        catch (err) {
-            this.log.warn(/** @type {Error} */ (err).message);
-            if (!lodash_1.default.isEmpty(this._screenRecordingProperties)) {
-                this.log.warn('The resulting video might be corrupted');
-            }
-        }
-        if (lodash_1.default.isEmpty(this._screenRecordingProperties)) {
-            this.log.info(`Screen recording has not been previously started by Appium. There is nothing to stop`);
-            return '';
-        }
-        if (this._screenRecordingProperties.recordingProcess &&
-            this._screenRecordingProperties.recordingProcess.isRunning) {
-            try {
-                await this._screenRecordingProperties.recordingProcess.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT);
-            }
-            catch (e) {
-                this.log.errorAndThrow(`Unable to stop screen recording within ${PROCESS_SHUTDOWN_TIMEOUT}ms`);
-            }
-            this._screenRecordingProperties.recordingProcess = null;
-        }
-        if (lodash_1.default.isEmpty(this._screenRecordingProperties.records)) {
-            this.log.errorAndThrow(`No screen recordings have been stored on the device so far. ` +
-                `Are you sure the ${SCREENRECORD_BINARY} utility works as expected?`);
-        }
-        const tmpRoot = await support_1.tempDir.openDir();
-        try {
-            const localRecords = [];
-            for (const pathOnDevice of this._screenRecordingProperties.records) {
-                const relativePath = path_1.default.resolve(tmpRoot, path_1.default.posix.basename(pathOnDevice));
-                localRecords.push(relativePath);
-                await this.adb.pull(pathOnDevice, relativePath);
-                await this.adb.rimraf(pathOnDevice);
-            }
-            let resultFilePath = /** @type {string} */ (lodash_1.default.last(localRecords));
-            if (localRecords.length > 1) {
-                this.log.info(`Got ${localRecords.length} screen recordings. Trying to merge them`);
-                try {
-                    resultFilePath = await mergeScreenRecords(localRecords, this.log);
-                }
-                catch (e) {
-                    this.log.warn(`Cannot merge the recorded files. The most recent screen recording is going to be returned as the result. ` +
-                        `Original error: ${ /** @type {Error} */(e).message}`);
-                }
-            }
-            if (lodash_1.default.isEmpty(options.remotePath)) {
-                const { size } = await support_1.fs.stat(resultFilePath);
-                this.log.debug(`The size of the resulting screen recording is ${support_1.util.toReadableSizeString(size)}`);
-            }
-            return await uploadRecordedMedia(resultFilePath, options.remotePath, options);
-        }
-        finally {
-            await support_1.fs.rimraf(tmpRoot);
-            this._screenRecordingProperties = undefined;
-        }
-    },
-};
-(0, mixins_1.mixin)(RecordScreenMixin);
-exports.default = RecordScreenMixin;
+// #endregion
 /**
  * @typedef {import('appium-adb').ADB} ADB
  */