appium-android-driver 7.8.3 → 8.0.0

package/build/lib/commands/log.js

@@ -1,16 +1,162 @@
 "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.getLog = exports.getLogTypes = exports.mobileStopLogsBroadcast = exports.mobileStartLogsBroadcast = exports.supportedLogTypes = void 0;
 const driver_1 = require("appium/driver");
 const lodash_1 = __importDefault(require("lodash"));
 const node_os_1 = __importDefault(require("node:os"));
 const ws_1 = __importDefault(require("ws"));
-const logger_1 = __importDefault(require("../logger"));
-const mixins_1 = require("./mixins");
 const GET_SERVER_LOGS_FEATURE = 'get_server_logs';
+exports.supportedLogTypes = {
+    logcat: {
+        description: 'Logs for Android applications on real device and emulators via ADB',
+        /**
+         *
+         * @param {import('../driver').AndroidDriver} self
+         * @returns
+         */
+        getter: (self) => /** @type {ADB} */ (self.adb).getLogcatLogs(),
+    },
+    bugreport: {
+        description: `'adb bugreport' output for advanced issues diagnostic`,
+        /**
+         *
+         * @param {import('../driver').AndroidDriver} self
+         * @returns
+         */
+        getter: async (self) => {
+            const output = await /** @type {ADB} */ (self.adb).bugreport();
+            const timestamp = Date.now();
+            return output.split(node_os_1.default.EOL).map((x) => toLogRecord(timestamp, 'ALL', x));
+        },
+    },
+    server: {
+        description: 'Appium server logs',
+        /**
+         *
+         * @param {import('../driver').AndroidDriver} self
+         * @returns
+         */
+        getter: (self) => {
+            self.ensureFeatureEnabled(GET_SERVER_LOGS_FEATURE);
+            const timestamp = Date.now();
+            return self.log
+                .unwrap()
+                .record.map((x) => toLogRecord(timestamp, 'ALL', lodash_1.default.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`));
+        },
+    },
+};
+/**
+ * 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.
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @returns {Promise<void>}
+ */
+async function mobileStartLogsBroadcast() {
+    const server = /** @type {import('@appium/types').AppiumServer} */ (this.server);
+    const pathname = WEBSOCKET_ENDPOINT(/** @type {string} */ (this.sessionId));
+    if (!lodash_1.default.isEmpty(await server.getWebSocketHandlers(pathname))) {
+        this.log.debug(`The logcat broadcasting web socket server is already listening at ${pathname}`);
+        return;
+    }
+    this.log.info(`Starting logcat broadcasting on web socket server ` +
+        `${JSON.stringify(server.address())} to ${pathname}`);
+    // https://github.com/websockets/ws/blob/master/doc/ws.md
+    const wss = new ws_1.default.Server({
+        noServer: true,
+    });
+    wss.on('connection', (ws, req) => {
+        if (req) {
+            const remoteIp = lodash_1.default.isEmpty(req.headers['x-forwarded-for'])
+                ? req.connection?.remoteAddress
+                : req.headers['x-forwarded-for'];
+            this.log.debug(`Established a new logcat listener web socket connection from ${remoteIp}`);
+        }
+        else {
+            this.log.debug('Established a new logcat listener web socket connection');
+        }
+        if (lodash_1.default.isEmpty(this._logcatWebsocketListener)) {
+            this._logcatWebsocketListener = (logRecord) => {
+                if (ws?.readyState === ws_1.default.OPEN) {
+                    ws.send(logRecord.message);
+                }
+            };
+        }
+        this.adb.setLogcatListener(this._logcatWebsocketListener);
+        ws.on('close', (code, reason) => {
+            if (!lodash_1.default.isEmpty(this._logcatWebsocketListener)) {
+                try {
+                    this.adb.removeLogcatListener(this._logcatWebsocketListener);
+                }
+                catch (ign) { }
+                this._logcatWebsocketListener = undefined;
+            }
+            let closeMsg = 'Logcat listener web socket is closed.';
+            if (!lodash_1.default.isEmpty(code)) {
+                closeMsg += ` Code: ${code}.`;
+            }
+            if (!lodash_1.default.isEmpty(reason)) {
+                closeMsg += ` Reason: ${reason.toString()}.`;
+            }
+            this.log.debug(closeMsg);
+        });
+    });
+    await server.addWebSocketHandler(pathname, /** @type {import('@appium/types').WSServer} */ (wss));
+}
+exports.mobileStartLogsBroadcast = mobileStartLogsBroadcast;
+/**
+ * Stops the previously started logcat broadcasting wesocket server.
+ * This method will return immediately if no server is running.
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @returns {Promise<void>}
+ */
+async function mobileStopLogsBroadcast() {
+    const pathname = WEBSOCKET_ENDPOINT(/** @type {string} */ (this.sessionId));
+    const server = /** @type {import('@appium/types').AppiumServer} */ (this.server);
+    if (lodash_1.default.isEmpty(await server.getWebSocketHandlers(pathname))) {
+        return;
+    }
+    this.log.debug(`Stopping logcat broadcasting on web socket server ` +
+        `${JSON.stringify(server.address())} to ${pathname}`);
+    await server.removeWebSocketHandler(pathname);
+}
+exports.mobileStopLogsBroadcast = mobileStopLogsBroadcast;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @returns {Promise<string[]>}
+ */
+async function getLogTypes() {
+    // XXX why doesn't `super` work here?
+    const nativeLogTypes = await driver_1.BaseDriver.prototype.getLogTypes.call(this);
+    if (this.isWebContext()) {
+        const webLogTypes = /** @type {string[]} */ (await /** @type {import('appium-chromedriver').Chromedriver} */ (this.chromedriver).jwproxy.command('/log/types', 'GET'));
+        return [...nativeLogTypes, ...webLogTypes];
+    }
+    return nativeLogTypes;
+}
+exports.getLogTypes = getLogTypes;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {string} logType
+ * @returns {Promise<any>}
+ */
+async function getLog(logType) {
+    if (this.isWebContext() && !lodash_1.default.keys(this.supportedLogTypes).includes(logType)) {
+        return await /** @type {import('appium-chromedriver').Chromedriver} */ (this.chromedriver).jwproxy.command('/log', 'POST', { type: logType });
+    }
+    // XXX why doesn't `super` work here?
+    return await driver_1.BaseDriver.prototype.getLog.call(this, logType);
+}
+exports.getLog = getLog;
+// #region Internal helpers
 /**
  * @param {string} sessionId
  * @returns {string}
@@ -30,143 +176,7 @@ function toLogRecord(timestamp, level, message) {
         message,
     };
 }
-/**
- * @type {import('./mixins').LogMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const LogMixin = {
-    supportedLogTypes: {
-        logcat: {
-            description: 'Logs for Android applications on real device and emulators via ADB',
-            /**
-             *
-             * @param {import('../driver').AndroidDriver} self
-             * @returns
-             */
-            getter: (self) => /** @type {ADB} */ (self.adb).getLogcatLogs(),
-        },
-        bugreport: {
-            description: `'adb bugreport' output for advanced issues diagnostic`,
-            /**
-             *
-             * @param {import('../driver').AndroidDriver} self
-             * @returns
-             */
-            getter: async (self) => {
-                const output = await /** @type {ADB} */ (self.adb).bugreport();
-                const timestamp = Date.now();
-                return output.split(node_os_1.default.EOL).map((x) => toLogRecord(timestamp, 'ALL', x));
-            },
-        },
-        server: {
-            description: 'Appium server logs',
-            /**
-             *
-             * @param {import('../driver').AndroidDriver} self
-             * @returns
-             */
-            getter: (self) => {
-                self.ensureFeatureEnabled(GET_SERVER_LOGS_FEATURE);
-                const timestamp = Date.now();
-                return logger_1.default
-                    .unwrap()
-                    .record.map((x) => toLogRecord(timestamp, 'ALL', lodash_1.default.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`));
-            },
-        },
-    },
-    /**
-     * 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.
-     */
-    async mobileStartLogsBroadcast() {
-        const server = /** @type {import('@appium/types').AppiumServer} */ (this.server);
-        const pathname = WEBSOCKET_ENDPOINT(/** @type {string} */ (this.sessionId));
-        if (!lodash_1.default.isEmpty(await server.getWebSocketHandlers(pathname))) {
-            logger_1.default.debug(`The logcat broadcasting web socket server is already listening at ${pathname}`);
-            return;
-        }
-        logger_1.default.info(`Starting logcat broadcasting on web socket server ` +
-            `${JSON.stringify(server.address())} to ${pathname}`);
-        // https://github.com/websockets/ws/blob/master/doc/ws.md
-        const wss = new ws_1.default.Server({
-            noServer: true,
-        });
-        wss.on('connection', (ws, req) => {
-            if (req) {
-                const remoteIp = lodash_1.default.isEmpty(req.headers['x-forwarded-for'])
-                    ? req.connection?.remoteAddress
-                    : req.headers['x-forwarded-for'];
-                logger_1.default.debug(`Established a new logcat listener web socket connection from ${remoteIp}`);
-            }
-            else {
-                logger_1.default.debug('Established a new logcat listener web socket connection');
-            }
-            if (lodash_1.default.isEmpty(this._logcatWebsocketListener)) {
-                this._logcatWebsocketListener = (logRecord) => {
-                    if (ws?.readyState === ws_1.default.OPEN) {
-                        ws.send(logRecord.message);
-                    }
-                };
-            }
-            this.adb.setLogcatListener(this._logcatWebsocketListener);
-            ws.on('close', (code, reason) => {
-                if (!lodash_1.default.isEmpty(this._logcatWebsocketListener)) {
-                    try {
-                        this.adb.removeLogcatListener(this._logcatWebsocketListener);
-                    }
-                    catch (ign) { }
-                    this._logcatWebsocketListener = undefined;
-                }
-                let closeMsg = 'Logcat listener web socket is closed.';
-                if (!lodash_1.default.isEmpty(code)) {
-                    closeMsg += ` Code: ${code}.`;
-                }
-                if (!lodash_1.default.isEmpty(reason)) {
-                    closeMsg += ` Reason: ${reason.toString()}.`;
-                }
-                logger_1.default.debug(closeMsg);
-            });
-        });
-        await server.addWebSocketHandler(pathname, 
-        /** @type {import('@appium/types').WSServer} */ (wss));
-    },
-    /**
-     * Stops the previously started logcat broadcasting wesocket server.
-     * This method will return immediately if no server is running.
-     */
-    async mobileStopLogsBroadcast() {
-        const pathname = WEBSOCKET_ENDPOINT(/** @type {string} */ (this.sessionId));
-        const server = /** @type {import('@appium/types').AppiumServer} */ (this.server);
-        if (lodash_1.default.isEmpty(await server.getWebSocketHandlers(pathname))) {
-            return;
-        }
-        logger_1.default.debug(`Stopping logcat broadcasting on web socket server ` +
-            `${JSON.stringify(server.address())} to ${pathname}`);
-        await server.removeWebSocketHandler(pathname);
-    },
-    async getLogTypes() {
-        // XXX why doesn't `super` work here?
-        const nativeLogTypes = await driver_1.BaseDriver.prototype.getLogTypes.call(this);
-        if (this.isWebContext()) {
-            const webLogTypes = /** @type {string[]} */ (await /** @type {import('appium-chromedriver').Chromedriver} */ (this.chromedriver).jwproxy.command('/log/types', 'GET'));
-            return [...nativeLogTypes, ...webLogTypes];
-        }
-        return nativeLogTypes;
-    },
-    async getLog(logType) {
-        if (this.isWebContext() && !lodash_1.default.keys(this.supportedLogTypes).includes(logType)) {
-            return await /** @type {import('appium-chromedriver').Chromedriver} */ (this.chromedriver).jwproxy.command('/log', 'POST', { type: logType });
-        }
-        // XXX why doesn't `super` work here?
-        return await driver_1.BaseDriver.prototype.getLog.call(this, logType);
-    },
-};
-(0, mixins_1.mixin)(LogMixin);
-exports.default = LogMixin;
+// #endregion
 /**
  * @typedef {import('appium-adb').ADB} ADB
  */

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

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

package/build/lib/commands/media-projection.d.ts

@@ -1,8 +1,19 @@
-export default MediaProjectionMixin;
-export type ADB = import('appium-adb').ADB;
 /**
- * @type {import('./mixins').MediaProjectionMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StartMediaProjectionRecordingOpts} [options={}]
+ * @returns {Promise<boolean>}
+ */
+export function mobileStartMediaProjectionRecording(this: import("../driver").AndroidDriver, options?: import("./types").StartMediaProjectionRecordingOpts | undefined): Promise<boolean>;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @returns {Promise<boolean>}
  */
-declare const MediaProjectionMixin: import('./mixins').MediaProjectionMixin & ThisType<import('../driver').AndroidDriver>;
+export function mobileIsMediaProjectionRecordingRunning(this: import("../driver").AndroidDriver): Promise<boolean>;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StopMediaProjectionRecordingOpts} [options={}]
+ * @returns {Promise<string>}
+ */
+export function mobileStopMediaProjectionRecording(this: import("../driver").AndroidDriver, options?: import("./types").StopMediaProjectionRecordingOpts | undefined): Promise<string>;
+export type ADB = import('appium-adb').ADB;
 //# sourceMappingURL=media-projection.d.ts.map

package/build/lib/commands/media-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media-projection.d.ts","sourceRoot":"","sources":["../../../lib/commands/media-projection.js"],"names":[],"mappings":";kBA8Ia,OAAO,YAAY,EAAE,GAAG;AAtErC;;;GAGG;AACH,oCAHU,OAAO,UAAU,EAAE,oBAAoB,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA8D7F"}
+{"version":3,"file":"media-projection.d.ts","sourceRoot":"","sources":["../../../lib/commands/media-projection.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,yKAFa,QAAQ,OAAO,CAAC,CAsB5B;AAED;;;GAGG;AACH,kGAFa,QAAQ,OAAO,CAAC,CAO5B;AAED;;;;GAIG;AACH,uKAFa,QAAQ,MAAM,CAAC,CA4B3B;kBAoEY,OAAO,YAAY,EAAE,GAAG"}

package/build/lib/commands/media-projection.js

@@ -3,15 +3,82 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mobileStopMediaProjectionRecording = exports.mobileIsMediaProjectionRecordingRunning = exports.mobileStartMediaProjectionRecording = void 0;
 const support_1 = require("@appium/support");
 const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));
 const node_path_1 = __importDefault(require("node:path"));
-const mixins_1 = require("./mixins");
 // https://github.com/appium/io.appium.settings#internal-audio--video-recording
 const DEFAULT_EXT = '.mp4';
 const MIN_API_LEVEL = 29;
 const DEFAULT_FILENAME_FORMAT = 'YYYY-MM-DDTHH-mm-ss';
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StartMediaProjectionRecordingOpts} [options={}]
+ * @returns {Promise<boolean>}
+ */
+async function mobileStartMediaProjectionRecording(options = {}) {
+    await verifyMediaProjectionRecordingIsSupported(this.adb);
+    const { resolution, priority, maxDurationSec, filename } = options;
+    const recorder = this.settingsApp.makeMediaProjectionRecorder();
+    const fname = adjustMediaExtension(filename || (0, moment_1.default)().format(DEFAULT_FILENAME_FORMAT));
+    const didStart = await recorder.start({
+        resolution,
+        priority,
+        maxDurationSec,
+        filename: fname,
+    });
+    if (didStart) {
+        this.log.info(`A new media projection recording '${fname}' has been successfully started`);
+    }
+    else {
+        this.log.info('Another media projection recording is already in progress. There is nothing to start');
+    }
+    return didStart;
+}
+exports.mobileStartMediaProjectionRecording = mobileStartMediaProjectionRecording;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @returns {Promise<boolean>}
+ */
+async function mobileIsMediaProjectionRecordingRunning() {
+    await verifyMediaProjectionRecordingIsSupported(this.adb);
+    const recorder = this.settingsApp.makeMediaProjectionRecorder();
+    return await recorder.isRunning();
+}
+exports.mobileIsMediaProjectionRecordingRunning = mobileIsMediaProjectionRecordingRunning;
+/**
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').StopMediaProjectionRecordingOpts} [options={}]
+ * @returns {Promise<string>}
+ */
+async function mobileStopMediaProjectionRecording(options = {}) {
+    await verifyMediaProjectionRecordingIsSupported(this.adb);
+    const recorder = this.settingsApp.makeMediaProjectionRecorder();
+    if (await recorder.stop()) {
+        this.log.info('Successfully stopped a media projection recording. Pulling the recorded media');
+    }
+    else {
+        this.log.info('Media projection recording is not running. There is nothing to stop');
+    }
+    const recentRecordingPath = await recorder.pullRecent();
+    if (!recentRecordingPath) {
+        throw new Error(`No recent media projection recording have been found. Did you start any?`);
+    }
+    const { remotePath } = options;
+    if (lodash_1.default.isEmpty(remotePath)) {
+        const { size } = await support_1.fs.stat(recentRecordingPath);
+        this.log.debug(`The size of the resulting media projection recording is ${support_1.util.toReadableSizeString(size)}`);
+    }
+    try {
+        return await uploadRecordedMedia(recentRecordingPath, remotePath, options);
+    }
+    finally {
+        await support_1.fs.rimraf(node_path_1.default.dirname(recentRecordingPath));
+    }
+}
+exports.mobileStopMediaProjectionRecording = mobileStopMediaProjectionRecording;
+// #region Internal helpers
 /**
  *
  * @param {string} localFile
@@ -59,63 +126,7 @@ async function verifyMediaProjectionRecordingIsSupported(adb) {
             `Minimum required API Level is ${MIN_API_LEVEL}.`);
     }
 }
-/**
- * @type {import('./mixins').MediaProjectionMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
- */
-const MediaProjectionMixin = {
-    async mobileStartMediaProjectionRecording(options = {}) {
-        await verifyMediaProjectionRecordingIsSupported(this.adb);
-        const { resolution, priority, maxDurationSec, filename } = options;
-        const recorder = this.settingsApp.makeMediaProjectionRecorder();
-        const fname = adjustMediaExtension(filename || (0, moment_1.default)().format(DEFAULT_FILENAME_FORMAT));
-        const didStart = await recorder.start({
-            resolution,
-            priority,
-            maxDurationSec,
-            filename: fname,
-        });
-        if (didStart) {
-            this.log.info(`A new media projection recording '${fname}' has been successfully started`);
-        }
-        else {
-            this.log.info('Another media projection recording is already in progress. There is nothing to start');
-        }
-        return didStart;
-    },
-    async mobileIsMediaProjectionRecordingRunning() {
-        await verifyMediaProjectionRecordingIsSupported(this.adb);
-        const recorder = this.settingsApp.makeMediaProjectionRecorder();
-        return await recorder.isRunning();
-    },
-    async mobileStopMediaProjectionRecording(options = {}) {
-        await verifyMediaProjectionRecordingIsSupported(this.adb);
-        const recorder = this.settingsApp.makeMediaProjectionRecorder();
-        if (await recorder.stop()) {
-            this.log.info('Successfully stopped a media projection recording. Pulling the recorded media');
-        }
-        else {
-            this.log.info('Media projection recording is not running. There is nothing to stop');
-        }
-        const recentRecordingPath = await recorder.pullRecent();
-        if (!recentRecordingPath) {
-            throw new Error(`No recent media projection recording have been found. Did you start any?`);
-        }
-        const { remotePath } = options;
-        if (lodash_1.default.isEmpty(remotePath)) {
-            const { size } = await support_1.fs.stat(recentRecordingPath);
-            this.log.debug(`The size of the resulting media projection recording is ${support_1.util.toReadableSizeString(size)}`);
-        }
-        try {
-            return await uploadRecordedMedia(recentRecordingPath, remotePath, options);
-        }
-        finally {
-            await support_1.fs.rimraf(node_path_1.default.dirname(recentRecordingPath));
-        }
-    },
-};
-(0, mixins_1.mixin)(MediaProjectionMixin);
-exports.default = MediaProjectionMixin;
+// #endregion
 /**
  * @typedef {import('appium-adb').ADB} ADB
  */

package/build/lib/commands/media-projection.js.map

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

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

@@ -1,8 +1,12 @@
-export default MemoryMixin;
-export type ADB = import('appium-adb').ADB;
 /**
- * @type {import('./mixins').MemoryMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
+ * Simulates the onTrimMemory() event for the given package.
+ * Read https://developer.android.com/topic/performance/memory
+ * for more details.
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').SendTrimMemoryOpts} opts
+ * @returns {Promise<void>}
  */
-declare const MemoryMixin: import('./mixins').MemoryMixin & ThisType<import('../driver').AndroidDriver>;
+export function mobileSendTrimMemory(this: import("../driver").AndroidDriver, opts: import('./types').SendTrimMemoryOpts): Promise<void>;
+export type ADB = import('appium-adb').ADB;
 //# sourceMappingURL=memory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../lib/commands/memory.js"],"names":[],"mappings":";kBAqCa,OAAO,YAAY,EAAE,GAAG;AAlCrC;;;GAGG;AACH,2BAHU,OAAO,UAAU,EAAE,WAAW,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CA0BpF"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../lib/commands/memory.js"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,oFAHW,OAAO,SAAS,EAAE,kBAAkB,GAClC,QAAQ,IAAI,CAAC,CAazB;kBAGY,OAAO,YAAY,EAAE,GAAG"}

package/build/lib/commands/memory.js

@@ -1,32 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mobileSendTrimMemory = void 0;
 const driver_1 = require("appium/driver");
-const mixins_1 = require("./mixins");
 /**
- * @type {import('./mixins').MemoryMixin & ThisType<import('../driver').AndroidDriver>}
- * @satisfies {import('@appium/types').ExternalDriver}
+ * Simulates the onTrimMemory() event for the given package.
+ * Read https://developer.android.com/topic/performance/memory
+ * for more details.
+ *
+ * @this {import('../driver').AndroidDriver}
+ * @param {import('./types').SendTrimMemoryOpts} opts
+ * @returns {Promise<void>}
  */
-const MemoryMixin = {
-    /**
-     * Simulates the onTrimMemory() event for the given package.
-     * Read https://developer.android.com/topic/performance/memory
-     * for more details.
-     *
-     * @param {import('./types').SendTrimMemoryOpts} opts
-     */
-    async mobileSendTrimMemory(opts) {
-        const { pkg, level, } = opts;
-        if (!pkg) {
-            throw new driver_1.errors.InvalidArgumentError(`The 'pkg' argument must be provided`);
-        }
-        if (!level) {
-            throw new driver_1.errors.InvalidArgumentError(`The 'level' argument must be provided`);
-        }
-        await this.adb.shell(['am', 'send-trim-memory', pkg, level]);
-    },
-};
-(0, mixins_1.mixin)(MemoryMixin);
-exports.default = MemoryMixin;
+async function mobileSendTrimMemory(opts) {
+    const { pkg, level } = opts;
+    if (!pkg) {
+        throw new driver_1.errors.InvalidArgumentError(`The 'pkg' argument must be provided`);
+    }
+    if (!level) {
+        throw new driver_1.errors.InvalidArgumentError(`The 'level' argument must be provided`);
+    }
+    await this.adb.shell(['am', 'send-trim-memory', pkg, level]);
+}
+exports.mobileSendTrimMemory = mobileSendTrimMemory;
 /**
  * @typedef {import('appium-adb').ADB} ADB
  */

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

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../lib/commands/memory.js"],"names":[],"mappings":";;AAAA,0CAAqC;AACrC,qCAA+B;AAE/B;;;GAGG;AACH,MAAM,WAAW,GAAG;IAClB;;;;;;OAMG;IACH,KAAK,CAAC,oBAAoB,CAAC,IAAI;QAC7B,MAAM,EACJ,GAAG,EACH,KAAK,GACN,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;SAC9E;QACD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,uCAAuC,CAAC,CAAC;SAChF;QAED,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/D,CAAC;CACF,CAAC;AAEF,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;AAEnB,kBAAe,WAAW,CAAC;AAE3B;;GAEG"}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../lib/commands/memory.js"],"names":[],"mappings":";;;AAAA,0CAAqC;AAErC;;;;;;;;GAQG;AACI,KAAK,UAAU,oBAAoB,CAAC,IAAI;IAC7C,MAAM,EAAC,GAAG,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC;IAE1B,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;KAC9E;IACD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,uCAAuC,CAAC,CAAC;KAChF;IAED,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/D,CAAC;AAXD,oDAWC;AAED;;GAEG"}