appium-mac2-driver 3.2.1 → 3.2.3

package/build/lib/driver.js

@@ -40,7 +40,7 @@ exports.Mac2Driver = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
 const wda_mac_1 = require("./wda-mac");
-const desired_caps_1 = require("./desired-caps");
+const constraints_1 = __importDefault(require("./constraints"));
 const appManagemenetCommands = __importStar(require("./commands/app-management"));
 const appleScriptCommands = __importStar(require("./commands/applescript"));
 const executeCommands = __importStar(require("./commands/execute"));
@@ -51,11 +51,10 @@ const recordScreenCommands = __importStar(require("./commands/record-screen"));
 const screenshotCommands = __importStar(require("./commands/screenshots"));
 const sourceCommands = __importStar(require("./commands/source"));
 const clipboardCommands = __importStar(require("./commands/clipboard"));
+const nativeScreenRecordingCommands = __importStar(require("./commands/native-record-screen"));
 const logger_1 = __importDefault(require("./logger"));
 const method_map_1 = require("./method-map");
 const execute_method_map_1 = require("./execute-method-map");
-const nativeScreenRecordingCommands = __importStar(require("./commands/native-record-screen"));
-/** @type {import('@appium/types').RouteMatcher[]} */
 const NO_PROXY = [
     ['GET', new RegExp('^/session/[^/]+/appium')],
     ['POST', new RegExp('^/session/[^/]+/appium')],
@@ -67,18 +66,16 @@ const NO_PROXY = [
     ['POST', new RegExp('^/session/[^/]+/timeouts$')],
 ];
 class Mac2Driver extends driver_1.BaseDriver {
-    /** @type {boolean} */
     isProxyActive;
-    /** @type {import('./wda-mac').WDAMacServer} */
-    wda;
-    /** @type {nativeScreenRecordingCommands.NativeVideoChunksBroadcaster} */
+    _wda;
     _videoChunksBroadcaster;
+    _screenRecorder;
+    proxyReqRes;
     static newMethodMap = method_map_1.newMethodMap;
     static executeMethodMap = execute_method_map_1.executeMethodMap;
     constructor(opts = {}) {
-        // @ts-ignore TODO: Make opts typed
         super(opts);
-        this.desiredCapConstraints = desired_caps_1.desiredCapConstraints;
+        this.desiredCapConstraints = lodash_1.default.cloneDeep(constraints_1.default);
         this.locatorStrategies = [
             'id',
             'name',
@@ -94,17 +91,18 @@ class Mac2Driver extends driver_1.BaseDriver {
         this.settings = new driver_1.DeviceSettings({}, this.onSettingsUpdate.bind(this));
     }
     async onSettingsUpdate(key, value) {
-        return await this.wda.proxy.command('/appium/settings', 'POST', {
+        if (!this._wda) {
+            return;
+        }
+        return await this._wda.proxy.command('/appium/settings', 'POST', {
             settings: { [key]: value }
         });
     }
-    resetState() {
-        // @ts-ignore This is ok
-        this.wda = null;
-        this.proxyReqRes = null;
-        this.isProxyActive = false;
-        this._videoChunksBroadcaster = new nativeScreenRecordingCommands.NativeVideoChunksBroadcaster(this.eventEmitter, this.log);
-        this._screenRecorder = null;
+    get wda() {
+        if (!this._wda) {
+            throw new Error('WDA server is not initialized');
+        }
+        return this._wda;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     proxyActive(sessionId) {
@@ -117,42 +115,44 @@ class Mac2Driver extends driver_1.BaseDriver {
     canProxy() {
         return true;
     }
-    /**
-     *
-     * @param {string} url
-     * @param {import('@appium/types').HTTPMethod} method
-     * @param {any} body
-     * @returns {Promise<any>}
-     */
     async proxyCommand(url, method, body = null) {
-        return await this.wda.proxy.command(url, method, body);
+        if (!this._wda) {
+            throw new Error('WDA server is not initialized');
+        }
+        return await this._wda.proxy.command(url, method, body);
     }
-    // @ts-ignore We know WDA response should be ok
     async getStatus() {
-        return await this.wda.proxy.command('/status', 'GET');
+        if (!this._wda) {
+            throw new Error('WDA server is not initialized');
+        }
+        return await this._wda.proxy.command('/status', 'GET');
     }
     // needed to make image plugin work
     async getWindowRect() {
-        return await this.wda.proxy.command('/window/rect', 'GET');
+        if (!this._wda) {
+            throw new Error('WDA server is not initialized');
+        }
+        return await this._wda.proxy.command('/window/rect', 'GET');
     }
-    // @ts-ignore TODO: make args typed
-    async createSession(...args) {
-        // @ts-ignore TODO: make args typed
-        const [sessionId, caps] = await super.createSession(...args);
-        this.wda = wda_mac_1.WDA_MAC_SERVER;
+    async createSession(w3cCaps1, w3cCaps2, w3cCaps3, driverData) {
+        const [sessionId, caps] = await super.createSession(w3cCaps1, w3cCaps2, w3cCaps3, driverData);
+        this._wda = wda_mac_1.WDA_MAC_SERVER;
+        this.caps = caps;
+        this.opts = this.opts;
         try {
-            if (caps.prerun) {
-                if (!lodash_1.default.isString(caps.prerun.command) && !lodash_1.default.isString(caps.prerun.script)) {
+            const prerun = caps.prerun;
+            if (prerun) {
+                if (!lodash_1.default.isString(prerun.command) && !lodash_1.default.isString(prerun.script)) {
                     throw new Error(`'prerun' capability value must either contain ` +
                         `'script' or 'command' entry of string type`);
                 }
                 logger_1.default.info('Executing prerun AppleScript');
-                const output = await this.macosExecAppleScript(caps.prerun);
+                const output = await this.macosExecAppleScript(prerun.script, undefined, prerun.command);
                 if (lodash_1.default.trim(output)) {
                     logger_1.default.info(`Prerun script output: ${output}`);
                 }
             }
-            await this.wda.startSession(caps, {
+            await this._wda.startSession(caps, {
                 reqBasePath: this.basePath,
             });
         }
@@ -160,29 +160,34 @@ class Mac2Driver extends driver_1.BaseDriver {
             await this.deleteSession();
             throw e;
         }
-        this.proxyReqRes = this.wda.proxy.proxyReqRes.bind(this.wda.proxy);
+        this.proxyReqRes = this.wda.proxy.proxyReqRes.bind(this._wda.proxy);
         this.isProxyActive = true;
         return [sessionId, caps];
     }
     async deleteSession() {
         await this._screenRecorder?.stop(true);
         if (this._videoChunksBroadcaster.hasPublishers) {
-            try {
-                await this.wda.proxy.command('/wda/video/stop', 'POST', {});
+            if (this._wda) {
+                try {
+                    await this.wda.proxy.command('/wda/video/stop', 'POST', {});
+                }
+                catch { }
             }
-            catch { }
             await this._videoChunksBroadcaster.shutdown(5000);
         }
-        await this.wda.stopSession();
-        if (this.opts.postrun) {
-            if (!lodash_1.default.isString(this.opts.postrun.command) && !lodash_1.default.isString(this.opts.postrun.script)) {
+        if (this._wda) {
+            await this.wda.stopSession();
+        }
+        const postrun = this.opts.postrun;
+        if (postrun) {
+            if (!lodash_1.default.isString(postrun.command) && !lodash_1.default.isString(postrun.script)) {
                 logger_1.default.error(`'postrun' capability value must either contain ` +
                     `'script' or 'command' entry of string type`);
             }
             else {
                 logger_1.default.info('Executing postrun AppleScript');
                 try {
-                    const output = await this.macosExecAppleScript(this.opts.postrun);
+                    const output = await this.macosExecAppleScript(postrun.script, undefined, postrun.command);
                     if (lodash_1.default.trim(output)) {
                         logger_1.default.info(`Postrun script output: ${output}`);
                     }
@@ -195,6 +200,12 @@ class Mac2Driver extends driver_1.BaseDriver {
         this.resetState();
         await super.deleteSession();
     }
+    resetState() {
+        this._wda = null;
+        this.isProxyActive = false;
+        this._videoChunksBroadcaster = new nativeScreenRecordingCommands.NativeVideoChunksBroadcaster(this.eventEmitter, this.log);
+        this._screenRecorder = null;
+    }
     macosLaunchApp = appManagemenetCommands.macosLaunchApp;
     macosActivateApp = appManagemenetCommands.macosActivateApp;
     macosTerminateApp = appManagemenetCommands.macosTerminateApp;

package/build/lib/driver.js.map

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

package/build/lib/logger.d.ts

@@ -1,3 +1,3 @@
-export default log;
 declare const log: import("@appium/types").AppiumLogger;
+export default log;
 //# sourceMappingURL=logger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";AAEA,wDAA2C"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,GAAG,sCAAiC,CAAC;AAE3C,eAAe,GAAG,CAAC"}

package/build/lib/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";;AAAA,4CAAwC;AAExC,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAE3C,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;AAAA,4CAAwC;AAExC,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAE3C,kBAAe,GAAG,CAAC"}

package/build/lib/method-map.d.ts

@@ -1,4 +1,4 @@
-export const newMethodMap: {
+export declare const newMethodMap: {
     readonly '/session/:sessionId/appium/start_recording_screen': {
         readonly POST: {
             readonly command: "startRecordingScreen";

package/build/lib/method-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-map.d.ts","sourceRoot":"","sources":["../../lib/method-map.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;EAaG"}
+{"version":3,"file":"method-map.d.ts","sourceRoot":"","sources":["../../lib/method-map.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;CAaf,CAAC"}

package/build/lib/method-map.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newMethodMap = void 0;
-exports.newMethodMap = ({
+exports.newMethodMap = {
     '/session/:sessionId/appium/start_recording_screen': {
         POST: {
             command: 'startRecordingScreen',
-            payloadParams: { optional: ['options'] }
-        }
+            payloadParams: { optional: ['options'] },
+        },
     },
     '/session/:sessionId/appium/stop_recording_screen': {
         POST: {
             command: 'stopRecordingScreen',
-            payloadParams: { optional: ['options'] }
-        }
+            payloadParams: { optional: ['options'] },
+        },
     },
-});
+};
 //# sourceMappingURL=method-map.js.map

package/build/lib/method-map.js.map

@@ -1 +1 @@
-{"version":3,"file":"method-map.js","sourceRoot":"","sources":["../../lib/method-map.js"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAwB,CAAC;IAChD,mDAAmD,EAAE;QACnD,IAAI,EAAE;YACJ,OAAO,EAAE,sBAAsB;YAC/B,aAAa,EAAE,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE;SACzC;KACF;IACD,kDAAkD,EAAE;QAClD,IAAI,EAAE;YACJ,OAAO,EAAE,qBAAqB;YAC9B,aAAa,EAAE,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAE;SACzC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"method-map.js","sourceRoot":"","sources":["../../lib/method-map.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,mDAAmD,EAAE;QACnD,IAAI,EAAE;YACJ,OAAO,EAAE,sBAAsB;YAC/B,aAAa,EAAE,EAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAC;SACvC;KACF;IACD,kDAAkD,EAAE;QAClD,IAAI,EAAE;YACJ,OAAO,EAAE,qBAAqB;YAC9B,aAAa,EAAE,EAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,EAAC;SACvC;KACF;CACO,CAAC"}

package/build/lib/utils.d.ts

@@ -1,18 +1,18 @@
+import _ from 'lodash';
 /**
- * Retrieves process ids of all the children processes created by the given
- * parent process identifier
+ * Calculates the path to the current module's root folder
  *
- * @param {number|string} parentPid parent process ID
- * @returns {Promise<string[]>} the list of matched children process ids
- * or an empty list if none matched
+ * @returns The full path to module root
+ * @throws If the current module root folder cannot be determined
  */
-export function listChildrenProcessIds(parentPid: number | string): Promise<string[]>;
+export declare const getModuleRoot: (() => string) & _.MemoizedFunction;
 /**
- * Calculates the path to the current module's root folder
+ * Retrieves process ids of all the children processes created by the given
+ * parent process identifier
  *
- * @returns {string} The full path to module root
- * @throws {Error} If the current module root folder cannot be determined
+ * @param parentPid parent process ID
+ * @returns the list of matched children process ids
+ * or an empty list if none matched
  */
-export const getModuleRoot: (() => string) & _.MemoizedFunction;
-import _ from 'lodash';
+export declare function listChildrenProcessIds(parentPid: number | string): Promise<string[]>;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,kDAJW,MAAM,GAAC,MAAM,GACX,OAAO,CAAC,MAAM,EAAE,CAAC,CAc7B;AAjCD;;;;;GAKG;AACH,gEAMG;cAlBW,QAAQ"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAMvB;;;;;GAKG;AACH,eAAO,MAAM,aAAa,SAAwC,MAAM,sBAMtE,CAAC;AAEH;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW3F"}

package/build/lib/utils.js

@@ -12,23 +12,22 @@ const MODULE_NAME = 'appium-mac2-driver';
 /**
  * Calculates the path to the current module's root folder
  *
- * @returns {string} The full path to module root
- * @throws {Error} If the current module root folder cannot be determined
+ * @returns The full path to module root
+ * @throws If the current module root folder cannot be determined
  */
-const getModuleRoot = lodash_1.default.memoize(function getModuleRoot() {
+exports.getModuleRoot = lodash_1.default.memoize(function getModuleRoot() {
     const root = support_1.node.getModuleRootSync(MODULE_NAME, __filename);
     if (!root) {
         throw new Error(`Cannot find the root folder of the ${MODULE_NAME} Node.js module`);
     }
     return root;
 });
-exports.getModuleRoot = getModuleRoot;
 /**
  * Retrieves process ids of all the children processes created by the given
  * parent process identifier
  *
- * @param {number|string} parentPid parent process ID
- * @returns {Promise<string[]>} the list of matched children process ids
+ * @param parentPid parent process ID
+ * @returns the list of matched children process ids
  * or an empty list if none matched
  */
 async function listChildrenProcessIds(parentPid) {
@@ -41,6 +40,6 @@ async function listChildrenProcessIds(parentPid) {
         return [pid, lodash_1.default.last(rest)];
     })
         .filter(([, ppid]) => ppid === `${parentPid}`)
-        .map(([pid]) => (String)(pid));
+        .map(([pid]) => String(pid));
 }
 //# sourceMappingURL=utils.js.map

package/build/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;AAyCS,wDAAsB;AAzC/B,oDAAuB;AACvB,+CAAoC;AACpC,4CAAsC;AAEtC,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,aAAa,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,aAAa;IACpD,MAAM,IAAI,GAAG,cAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,sCAAsC,WAAW,iBAAiB,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC,CAAC;AAuB8B,sCAAa;AArB9C;;;;;;;GAOG;AACH,KAAK,UAAU,sBAAsB,CAAE,SAAS;IAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,mBAAI,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3D,wEAAwE;IACxE,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;SACtB,MAAM,CAAC,gBAAC,CAAC,IAAI,CAAC;SACd,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,gBAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,EAAE,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,SAAS,EAAE,CAAC;SAC7C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAE,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;;;;;AA4BA,wDAWC;AAvCD,oDAAuB;AACvB,+CAAoC;AACpC,4CAAsC;AAEtC,MAAM,WAAW,GAAG,oBAAoB,CAAC;AAEzC;;;;;GAKG;AACU,QAAA,aAAa,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,aAAa;IAC3D,MAAM,IAAI,GAAG,cAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,sCAAsC,WAAW,iBAAiB,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC,CAAC;AAEH;;;;;;;GAOG;AACI,KAAK,UAAU,sBAAsB,CAAE,SAA0B;IACtE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,mBAAI,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3D,wEAAwE;IACxE,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;SACtB,MAAM,CAAC,gBAAC,CAAC,IAAI,CAAC;SACd,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;QACpB,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,gBAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,EAAE,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,SAAS,EAAE,CAAC;SAC7C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC"}

package/lib/commands/record-screen.js

@@ -29,7 +29,7 @@ async function requireFfmpegPath (log) {
   }
 }
 
-class ScreenRecorder {
+export class ScreenRecorder {
   /**
    *
    * @param {string} videoPath

package/lib/constraints.ts

@@ -0,0 +1,60 @@
+import {Constraints} from '@appium/types';
+
+const MAC2_CONSTRAINTS = {
+  systemPort: {
+    isNumber: true,
+  },
+  systemHost: {
+    isString: true,
+  },
+  showServerLogs: {
+    isBoolean: true,
+  },
+  bootstrapRoot: {
+    isString: true,
+  },
+  serverStartupTimeout: {
+    isNumber: true,
+  },
+  bundleId: {
+    isString: true,
+  },
+  arguments: {
+    isArray: true,
+  },
+  environment: {
+    isObject: true,
+  },
+  noReset: {
+    isBoolean: true,
+  },
+  skipAppKill: {
+    isBoolean: true,
+  },
+  prerun: {
+    isObject: true,
+  },
+  postrun: {
+    isObject: true,
+  },
+  webDriverAgentMacUrl: {
+    isString: true,
+  },
+  appPath: {
+    isString: true,
+  },
+  appLocale: {
+    isObject: true,
+  },
+  appTimeZone: {
+    isString: true,
+  },
+  initialDeeplinkUrl: {
+    isString: true,
+  },
+} as const satisfies Constraints;
+
+export default MAC2_CONSTRAINTS;
+
+export type Mac2Constraints = typeof MAC2_CONSTRAINTS;
+

package/lib/doctor/optional-checks.ts

@@ -0,0 +1,67 @@
+import {resolveExecutablePath} from './utils';
+import {doctor} from 'appium/support';
+import {exec} from 'teen_process';
+import type {IDoctorCheck, AppiumLogger, DoctorCheckResult} from '@appium/types';
+import '@colors/colors';
+
+export class OptionalFfmpegCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly FFMPEG_BINARY = 'ffmpeg';
+  static readonly FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    const ffmpegPath = await resolveExecutablePath(OptionalFfmpegCheck.FFMPEG_BINARY);
+
+    return ffmpegPath
+      ? doctor.okOptional(`${OptionalFfmpegCheck.FFMPEG_BINARY} exists at '${ffmpegPath}'`)
+      : doctor.nokOptional(`${OptionalFfmpegCheck.FFMPEG_BINARY} cannot be found`);
+  }
+
+  async fix(): Promise<string> {
+    return (
+      `${`${OptionalFfmpegCheck.FFMPEG_BINARY}`.bold} is used to capture screen recordings. ` +
+      `Please read ${OptionalFfmpegCheck.FFMPEG_INSTALL_LINK}.`
+    );
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return true;
+  }
+}
+export const optionalFfmpegCheck = new OptionalFfmpegCheck();
+
+
+export class OptionalAutomationModeCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    let stdout: string;
+    try {
+      ({stdout} = await exec('automationmodetool'));
+    } catch (err) {
+      return doctor.nokOptional(`Cannot run 'automationmodetool': ${(err as any).stderr || (err as Error).message}`);
+    }
+    if (stdout.includes('DOES NOT REQUIRE')) {
+      return doctor.okOptional(`Automation Mode does not require user authentication`);
+    }
+    return doctor.nokOptional(`Automation Mode requires user authentication`);
+  }
+
+  async fix(): Promise<string> {
+    return `Run \`automationmodetool enable-automationmode-without-authentication\` to disable Automation Mode authentication`;
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return true;
+  }
+}
+export const optionalAutomationModeCheck = new OptionalAutomationModeCheck();
+

package/lib/doctor/required-checks.ts

@@ -0,0 +1,75 @@
+import {doctor} from 'appium/support';
+import {exec} from 'teen_process';
+import { getPath as getXcodePath } from 'appium-xcode';
+import type {IDoctorCheck, AppiumLogger, DoctorCheckResult} from '@appium/types';
+import '@colors/colors';
+
+
+export class XcodeCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    try {
+      const xcodePath = await getXcodePath();
+      return doctor.ok(`xCode is installed at '${xcodePath}'`);
+    } catch (err) {
+      return doctor.nok((err as Error).message);
+    }
+  }
+
+  async fix(): Promise<string> {
+    return `Manually install ${'Xcode'.bold} and configure the active developer directory path using the xcode-select tool`;
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return false;
+  }
+}
+export const xcodeCheck = new XcodeCheck();
+
+
+export class XcodebuildCheck implements IDoctorCheck {
+  log!: AppiumLogger;
+  static readonly XCODE_VER_PATTERN = /^Xcode\s+([\d.]+)$/m;
+  static readonly MIN_XCODE_VERSION = 13;
+
+  async diagnose(): Promise<DoctorCheckResult> {
+    let xcodeVerMatch: RegExpExecArray | null;
+    let stdout: string;
+    let stderr: string;
+    try {
+      ({stdout, stderr} = await exec('xcodebuild', ['-version']));
+      xcodeVerMatch = XcodebuildCheck.XCODE_VER_PATTERN.exec(stdout);
+    } catch (err) {
+      return doctor.nok(`Cannot run 'xcodebuild': ${(err as any).stderr || (err as Error).message}`);
+    }
+    if (!xcodeVerMatch) {
+      return doctor.nok(`Cannot determine Xcode version. stdout: ${stdout}; stderr: ${stderr}`);
+    }
+    const xcodeMajorVer = parseInt(xcodeVerMatch[1], 10);
+    if (xcodeMajorVer < XcodebuildCheck.MIN_XCODE_VERSION) {
+      return doctor.nok(`The actual Xcode version (${xcodeVerMatch[0]}) is older than the expected ` +
+        `one (${XcodebuildCheck.MIN_XCODE_VERSION})`);
+    }
+    return doctor.ok(`xcodebuild is installed and has a matching version number ` +
+      `(${xcodeVerMatch[1]} >= ${XcodebuildCheck.MIN_XCODE_VERSION})`);
+  }
+
+  async fix(): Promise<string> {
+    return `Install ${'Xcode'.bold} ${XcodebuildCheck.MIN_XCODE_VERSION}+ or upgrade the existing setup`;
+  }
+
+  hasAutofix(): boolean {
+    return false;
+  }
+
+  isOptional(): boolean {
+    return false;
+  }
+}
+export const xcodebuildCheck = new XcodebuildCheck();
+

package/lib/doctor/{utils.js → utils.ts}

@@ -3,10 +3,10 @@ import {fs} from 'appium/support';
 /**
  * Return an executable path of cmd
  *
- * @param {string} cmd Standard output by command
- * @return {Promise<string?>} The full path of cmd. `null` if the cmd is not found.
+ * @param cmd Standard output by command
+ * @return The full path of cmd. `null` if the cmd is not found.
  */
-export async function resolveExecutablePath(cmd) {
+export async function resolveExecutablePath(cmd: string): Promise<string | null> {
   try {
     const executablePath = await fs.which(cmd);
     if (executablePath && (await fs.exists(executablePath))) {
@@ -15,3 +15,4 @@ export async function resolveExecutablePath(cmd) {
   } catch {}
   return null;
 }
+