appium-xcuitest-driver 7.22.1 → 7.23.1

package/lib/real-device-clients/py-ios-device-client.ts

@@ -0,0 +1,149 @@
+import {exec, SubProcess} from 'teen_process';
+import {fs, util, tempDir} from 'appium/support';
+import path from 'path';
+import { BaseDeviceClient } from './base-device-client';
+import type { BaseDeviceClientOptions, InstallProfileArgs } from './base-device-client';
+import type { TeenProcessExecResult } from 'teen_process';
+import type { CertificateList } from '../commands/types';
+
+// https://github.com/YueChen-C/py-ios-device
+
+const BINARY_NAME = 'pyidevice';
+const CRASH_REPORT_EXT = '.ips';
+
+export interface PyideviceOptions extends BaseDeviceClientOptions {
+  udid: string;
+}
+
+interface ExecuteOptions {
+  cwd?: string;
+  format?: string | null;
+  logStdout?: boolean;
+  asynchronous?: boolean;
+}
+
+export class Pyidevice extends BaseDeviceClient {
+  private readonly _udid: string;
+  private _binaryPath: string | null;
+
+  constructor(opts: PyideviceOptions) {
+    super({log: opts.log});
+    this._udid = opts.udid;
+    this._binaryPath = null;
+  }
+
+  override async assertExists(isStrict = true): Promise<boolean> {
+    if (this._binaryPath) {
+      return true;
+    }
+
+    try {
+      this._binaryPath = await fs.which(BINARY_NAME);
+      return true;
+    } catch (e) {
+      if (isStrict) {
+        throw new Error(
+          `${BINARY_NAME} binary cannot be found in PATH. ` +
+            `Please make sure it is installed. Visit https://github.com/YueChen-C/py-ios-device for ` +
+            `more details.`,
+        );
+      }
+      return false;
+    }
+  }
+
+  override async listProfiles(): Promise<CertificateList> {
+    const {stdout} = await this.execute(['profiles', 'list']) as TeenProcessExecResult<string>;
+    return JSON.parse(stdout);
+  }
+
+  override async installProfile(args: InstallProfileArgs): Promise<void> {
+    const {profilePath, payload} = args;
+    if (!profilePath && !payload) {
+      throw new Error('Either the full path to the profile or its payload must be provided');
+    }
+
+    let tmpRoot: string | undefined;
+    let srcPath = profilePath;
+    try {
+      if (!srcPath) {
+        tmpRoot = await tempDir.openDir();
+        srcPath = path.join(tmpRoot, 'cert.pem');
+        if (Buffer.isBuffer(payload)) {
+          await fs.writeFile(srcPath, payload);
+        } else {
+          await fs.writeFile(srcPath, payload as string, 'utf8');
+        }
+      }
+      await this.execute(['profiles', 'install', '--path', srcPath], {
+        logStdout: true,
+      });
+    } finally {
+      if (tmpRoot) {
+        await fs.rimraf(tmpRoot);
+      }
+    }
+  }
+
+  override async removeProfile(name: string): Promise<string> {
+    return (
+      await this.execute(['profiles', 'remove', '--name', name], {logStdout: true}) as TeenProcessExecResult<string>
+    ).stdout;
+  }
+
+  override async listCrashes(): Promise<string[]> {
+    const {stdout} = await this.execute(['crash', 'list']) as TeenProcessExecResult<string>;
+    // Example output:
+    // ['.', '..', 'SiriSearchFeedback-2023-12-06-144043.ips', '
+    // SiriSearchFeedback-2024-05-22-194219.ips', 'JetsamEvent-2024-05-23-225056.ips',
+    // 'JetsamEvent-2023-09-18-090920.ips', 'JetsamEvent-2024-05-16-054529.ips',
+    // 'Assistant']
+    return JSON.parse(stdout.replace(/'/g, '"'))
+      .filter((x: string) => x.endsWith(CRASH_REPORT_EXT));
+  }
+
+  override async exportCrash(name: string, dstFolder: string): Promise<void> {
+    await this.execute(['crash', 'export', '--name', name], {
+      logStdout: true,
+      // The tool exports crash reports to the current working dir
+      cwd: dstFolder,
+    });
+  }
+
+  override async collectPcap(dstFile: string): Promise<SubProcess> {
+    return await this.execute(['pcapd', dstFile], {
+      format: null,
+      asynchronous: true,
+    }) as SubProcess;
+  }
+
+  private async execute(
+    args: string[],
+    opts: ExecuteOptions = {}
+  ): Promise<TeenProcessExecResult<string> | SubProcess> {
+    await this.assertExists();
+    const {cwd, format = 'json', logStdout = false, asynchronous = false} = opts;
+
+    const finalArgs = [...args, '--udid', this._udid, '--network'];
+    if (format) {
+      finalArgs.push('--format', format);
+    }
+    const binaryPath = this._binaryPath as string;
+    const cmdStr = util.quote([binaryPath, ...finalArgs]);
+    this.log.debug(`Executing ${cmdStr}`);
+    try {
+      if (asynchronous) {
+        const result = new SubProcess(binaryPath, finalArgs, {cwd});
+        await result.start(0);
+        return result;
+      }
+      const result = await exec(binaryPath, finalArgs, {cwd});
+      if (logStdout) {
+        this.log.debug(`Command output: ${result.stdout}`);
+      }
+      return result;
+    } catch (e) {
+      throw new Error(`'${cmdStr}' failed. Original error: ${e.stderr || e.stdout || e.message}`);
+    }
+  }
+}

package/lib/real-device.js

@@ -6,7 +6,7 @@ import defaultLogger from './logger';
 import _ from 'lodash';
 import {SAFARI_BUNDLE_ID} from './app-utils';
 import {pushFile, pushFolder, IO_TIMEOUT_MS} from './ios-fs-helpers';
-import { Devicectl } from './devicectl';
+import { Devicectl } from './real-device-clients/devicectl';
 
 const APPLICATION_INSTALLED_NOTIFICATION = 'com.apple.mobile.application_installed';
 const APPLICATION_NOTIFICATION_TIMEOUT_MS = 30 * 1000;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "7.22.1",
+  "version": "7.23.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "7.22.1",
+      "version": "7.23.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@colors/colors": "^1.6.0",
@@ -35,7 +35,6 @@
       },
       "devDependencies": {
         "@appium/docutils": "^1.0.2",
-        "@appium/eslint-config-appium": "^8.0.4",
         "@appium/eslint-config-appium-ts": "^0.x",
         "@appium/test-support": "^3.0.20",
         "@appium/tsconfig": "^0.x",
@@ -113,6 +112,14 @@
         "spdy": "4.0.2"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/lru-cache": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
+      "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
     "node_modules/@appium/base-driver/node_modules/type-fest": {
       "version": "4.20.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.1.tgz",
@@ -740,9 +747,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.14.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-      "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
+      "version": "20.14.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
+      "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -2310,14 +2317,14 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
-      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.2.tgz",
+      "integrity": "sha512-qH3nOSj8q/8+Eg8LUPOq3C+6HWkpUioIjDsq1+D4zY91oZvpPttw8GwtF1nReRYKXl+1AORyFqtm2f5Q1SB6/Q==",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": ">=14"
+        "node": "14 >=14.21 || 16 >=16.20 || >=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -2501,11 +2508,11 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
-      "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.2.tgz",
+      "integrity": "sha512-voV4dDrdVZVNz84n39LFKDaRzfwhdzJ7akpyXfTMxCgRUp07U3lcJUXRlhTKP17rgt09sUzLi5iCitpEAr+6ug==",
       "engines": {
-        "node": "14 || >=16.14"
+        "node": "14 || 16 || 18 || 20 || >=22"
       }
     },
     "node_modules/make-error": {
@@ -2777,9 +2784,9 @@
       }
     },
     "node_modules/node-simctl": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/node-simctl/-/node-simctl-7.5.2.tgz",
-      "integrity": "sha512-ap0QEMMcHbd+r86UQHRc9EsDvgP0PIio56B0Phh3iwQ5STEClCUGEGVwCVrxqlrwSCRYM26Glx39vwgGUyHUPA==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/node-simctl/-/node-simctl-7.5.3.tgz",
+      "integrity": "sha512-afI01Azk7IZdL/sI+qUDpvhAv+G5jQLq8SirqdzP6+GciiP15yWELAKhfhMYwJAB+qI37/J2uZzgHo/4a2FQXQ==",
       "dependencies": {
         "@appium/logger": "^1.3.0",
         "asyncbox": "^3.0.0",
@@ -2788,7 +2795,7 @@
         "rimraf": "^5.0.0",
         "semver": "^7.0.0",
         "source-map-support": "^0.x",
-        "teen_process": "^2.0.0",
+        "teen_process": "^2.2.0",
         "uuid": "^10.0.0",
         "which": "^4.0.0"
       },
@@ -3252,9 +3259,9 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz",
-      "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==",
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.9.tgz",
+      "integrity": "sha512-3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA==",
       "dependencies": {
         "glob": "^10.3.7"
       },
@@ -3262,7 +3269,7 @@
         "rimraf": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=14.18"
+        "node": "14 >=14.20 || 16 >=16.20 || >=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -3813,9 +3820,9 @@
       }
     },
     "node_modules/text-decoder": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
-      "integrity": "sha512-TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
+      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
       "dependencies": {
         "b4a": "^1.6.4"
       }
@@ -4041,9 +4048,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "engines": {
         "node": ">=10.0.0"
       },

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.22.1",
+  "version": "7.23.1",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -135,7 +135,6 @@
   },
   "devDependencies": {
     "@appium/docutils": "^1.0.2",
-    "@appium/eslint-config-appium": "^8.0.4",
     "@appium/eslint-config-appium-ts": "^0.x",
     "@appium/test-support": "^3.0.20",
     "@appium/tsconfig": "^0.x",

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

@@ -1 +0,0 @@
-{"version":3,"file":"devicectl.d.ts","sourceRoot":"","sources":["../../lib/devicectl.js"],"names":[],"mappings":"AAMA;;;;GAIG;AAUH;;;;;;;;;;;;;GAaG;AAmBH;;;;;;;GAOG;AAEH;;GAEG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AAGH;;;;;GAKG;AAEH;IACE;;;;OAIG;IACH,kBAHW,MAAM,OACN,OAAO,eAAe,EAAE,YAAY,EAK9C;IAFC,aAAgB;IAChB,0CAAc;IAGhB;;;;;OAKG;IACH,QAL8B,SAAS,SAAzB,cAAe,cAClB,MAAM,EAAE,iCAEP,OAAO,CAAC,SAAS,SAAS,UAAU,GAAG,OAAO,cAAc,EAAE,UAAU,GAAG,iDAA4C,CAAC,CA6CnI;IAED;;;;;OAKG;IACH,uBAHW,MAAM,GAAC,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAMxB;IAED;;;;OAIG;IACH,iBAFa,OAAO,CAAC,WAAW,EAAE,CAAC,CAKlC;IAED;;;;;;;;;;;OAWG;IACH,sBATW,MAAM,oBAKN,MAAM,wCAEJ,OAAO,CAAC,MAAM,EAAE,CAAC,CAiB7B;IAED;;;;;;;OAOG;IACH,eALW,MAAM,MACN,MAAM,QACN,eAAe,GACb,OAAO,CAAC,MAAM,CAAC,CAkB3B;IAED;;;;;;OAMG;IACH,yBAJW,MAAM,GAAC,MAAM,UACb,MAAM,GAAC,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAMzB;IAED;;;;;;OAMG;IACH,gDAFa,OAAO,CAAC,OAAO,EAAE,CAAC,CAW9B;IAED;;;;;;;;;OASG;IACH,oBALW,MAAM,QACN,gBAAgB,GACd,OAAO,CAAC,IAAI,CAAC,CAqBzB;CACF;;uBA1Ra,MAAM;gBACN,MAAM;;;aAaN,OAAO;sBACP,OAAO;sBACP,MAAM;mBACN,MAAM;gBACN,OAAO;YACP,OAAO;iBACP,OAAO;UACP,MAAM;eACN,OAAO;SACP,MAAM;aACN,MAAM;;;;;;;;;yBA8BP;IAAC,YAAY,EAAE,IAAI,CAAA;CAAC;;;;;;;;;;;;;;;;;;;;;;;gBAYnB,MAAM;;;;sBAKN,MAAM"}

package/build/lib/devicectl.js.map

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

package/build/lib/py-ios-device-client.d.ts

@@ -1,76 +0,0 @@
-export default Pyidevice;
-export class Pyidevice {
-    /**
-     * @param {string} udid
-     */
-    constructor(udid: string);
-    udid: string;
-    binaryPath: string | null;
-    /**
-     * @param {boolean} isStrict
-     * @return {Promise<boolean>}
-     */
-    assertExists(isStrict?: boolean): Promise<boolean>;
-    /**
-     * @typedef {Object} ExecuteOptions
-     * @property {string} cwd
-     * @property {string?} format [json]
-     * @property {boolean} logStdout [false]
-     * @property {boolean} asynchronous [false]
-     */
-    /**
-     * @param {string[]} args
-     * @param {Partial<ExecuteOptions>} opts
-     * @return {Promise<import('teen_process').TeenProcessExecResult|import('teen_process').SubProcess>}
-     */
-    execute(args: string[], opts?: Partial<{
-        cwd: string;
-        /**
-         * [json]
-         */
-        format: string | null;
-        /**
-         * [false]
-         */
-        logStdout: boolean;
-        /**
-         * [false]
-         */
-        asynchronous: boolean;
-    }>): Promise<import("teen_process").TeenProcessExecResult<any> | import("teen_process").SubProcess>;
-    /**
-     * @return {Promise<object>}
-     */
-    listProfiles(): Promise<object>;
-    /**
-     *
-     * @param { {profilePath?: string, payload: string|Buffer} } opts
-     * @privateRemarks The error below seems to suggest that `payload` can be undefined, but the code suggests otherwise
-     */
-    installProfile(opts: {
-        profilePath?: string;
-        payload: string | Buffer;
-    }): Promise<void>;
-    /**
-     *
-     * @param {string} name
-     * @returns {Promise<string>}
-     */
-    removeProfile(name: string): Promise<string>;
-    /**
-     * @returns {Promise<object>}
-     */
-    listCrashes(): Promise<object>;
-    /**
-     * @param {string} name
-     * @param {string} dstFolder
-     * @returns {Promise<void>}
-     */
-    exportCrash(name: string, dstFolder: string): Promise<void>;
-    /**
-     * @param {string} dstFile
-     */
-    collectPcap(dstFile: string): Promise<SubProcess | import("teen_process").TeenProcessExecResult<any>>;
-}
-import { SubProcess } from 'teen_process';
-//# sourceMappingURL=py-ios-device-client.d.ts.map

package/build/lib/py-ios-device-client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"py-ios-device-client.d.ts","sourceRoot":"","sources":["../../lib/py-ios-device-client.js"],"names":[],"mappings":";AASA;IACE;;OAEG;IACH,kBAFW,MAAM,EAKhB;IAFC,aAAgB;IAChB,0BAAsB;IAGxB;;;OAGG;IACH,wBAHW,OAAO,GACN,OAAO,CAAC,OAAO,CAAC,CAoB3B;IAED;;;;;;OAMG;IAEH;;;;OAIG;IACH,cAJW,MAAM,EAAE,SACR,OAAO;aARJ,MAAM;;;;gBACN,MAAM,OAAC;;;;mBACP,OAAO;;;;sBACP,OAAO;MAKa,GACtB,OAAO,CAAC,iDAA4C,GAAC,OAAO,cAAc,EAAE,UAAU,CAAC,CA2BlG;IAED;;OAEG;IACH,gBAFY,OAAO,CAAC,MAAM,CAAC,CAO1B;IAED;;;;OAIG;IACH,qBAHY;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAC,MAAM,CAAA;KAAC,iBAyBzD;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACJ,OAAO,CAAC,MAAM,CAAC,CAM3B;IAED;;OAEG;IACH,eAFa,OAAO,CAAC,MAAM,CAAC,CAO3B;IAED;;;;OAIG;IACH,kBAJW,MAAM,aACN,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAQzB;IACD;;OAEG;IACH,qBAFW,MAAM,2EAOhB;CACF;2BAnK8B,cAAc"}

package/build/lib/py-ios-device-client.js.map

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

package/lib/device-log/ios-crash-log.js

@@ -1,146 +0,0 @@
-import {fs, tempDir} from 'appium/support';
-import B from 'bluebird';
-import log from '../logger';
-import {utilities} from 'appium-ios-device';
-import path from 'path';
-import _ from 'lodash';
-import Pyidevice from '../py-ios-device-client';
-
-const REAL_DEVICE_MAGIC = '3620bbb0-fb9f-4b62-a668-896f2edc4d88';
-const MAGIC_SEP = '/';
-// The file format has been changed from '.crash' to '.ips' since Monterey.
-const CRASH_REPORTS_GLOB_PATTERN = '**/*.@(crash|ips)';
-
-class IOSCrashLog {
-  constructor(opts = {}) {
-    this.udid = opts.udid;
-    this.pyideviceClient = this.udid ? new Pyidevice(this.udid) : null;
-    const root = process.env.HOME || '/';
-    const logDir = opts.udid
-      ? path.resolve(root, 'Library', 'Logs', 'CrashReporter', 'MobileDevice')
-      : path.resolve(root, 'Library', 'Logs', 'DiagnosticReports');
-    this.logDir = logDir || path.resolve(root, 'Library', 'Logs', 'DiagnosticReports');
-    this.prevLogs = [];
-    this.logsSinceLastRequest = [];
-    this.phoneName = null;
-    this.sim = opts.sim;
-  }
-
-  /**
-   * @returns {Promise<string[]>}
-   */
-  async _gatherFromRealDevice() {
-    if (await this.pyideviceClient?.assertExists(false)) {
-      return (await /** @type {Pyidevice} */ (this.pyideviceClient).listCrashes()).map(
-        (x) => `${REAL_DEVICE_MAGIC}${MAGIC_SEP}${x}`,
-      );
-    }
-
-    let crashLogsRoot = this.logDir;
-    if (this.udid) {
-      this.phoneName = this.phoneName || (await utilities.getDeviceName(this.udid));
-      crashLogsRoot = path.resolve(crashLogsRoot, this.phoneName);
-    }
-    if (!(await fs.exists(crashLogsRoot))) {
-      log.debug(`Crash reports root '${crashLogsRoot}' does not exist. Got nothing to gather.`);
-      return [];
-    }
-    return await fs.glob(CRASH_REPORTS_GLOB_PATTERN, {
-      cwd: crashLogsRoot,
-      absolute: true,
-    });
-  }
-
-  /**
-   * @returns {Promise<string[]>}
-   */
-  async _gatherFromSimulator() {
-    if (!(await fs.exists(this.logDir))) {
-      log.debug(`Crash reports root '${this.logDir}' does not exist. Got nothing to gather.`);
-      return [];
-    }
-    const foundFiles = await fs.glob(CRASH_REPORTS_GLOB_PATTERN, {
-      cwd: this.logDir,
-      absolute: true,
-    });
-    // For Simulator only include files, that contain current UDID
-    return await B.filter(foundFiles, async (x) => {
-      try {
-        const content = await fs.readFile(x, 'utf8');
-        return content.toUpperCase().includes(this.sim.udid.toUpperCase());
-      } catch (err) {
-        return false;
-      }
-    });
-  }
-
-  /**
-   * @returns {Promise<string[]>}
-   */
-  async getCrashes() {
-    return this.udid ? await this._gatherFromRealDevice() : await this._gatherFromSimulator();
-  }
-
-  /**
-   * @returns {Promise<void>}
-   */
-  async startCapture() {
-    this.prevLogs = await this.getCrashes();
-  }
-
-  /**
-   * @returns {Promise<void>}
-   */
-  async stopCapture() {
-    // needed for consistent API with other logs
-  }
-
-  /**
-   * @returns {Promise<import('../commands/types').LogEntry[]>}
-   */
-  async getLogs() {
-    let crashFiles = await this.getCrashes();
-    let diff = _.difference(crashFiles, this.prevLogs, this.logsSinceLastRequest);
-    this.logsSinceLastRequest = _.union(this.logsSinceLastRequest, diff);
-    return await this.filesToJSON(diff);
-  }
-
-  /**
-   * @param {string[]} paths
-   * @returns {Promise<import('../commands/types').LogEntry[]>}
-   */
-  async filesToJSON(paths) {
-    const tmpRoot = await tempDir.openDir();
-    try {
-      return /** @type {import('../commands/types').LogEntry[]} */ ((
-        await B.map(paths, async (fullPath) => {
-          if (_.includes(fullPath, REAL_DEVICE_MAGIC)) {
-            const fileName = /** @type {string} */ (_.last(fullPath.split(MAGIC_SEP)));
-            try {
-              // @ts-expect-error If pyideviceClient is not defined, then the exception will be caught below
-              await this.pyideviceClient.exportCrash(fileName, tmpRoot);
-            } catch (e) {
-              log.warn(
-                `Cannot export the crash report '${fileName}'. Skipping it. ` +
-                  `Original error: ${e.message}`,
-              );
-              return;
-            }
-            fullPath = path.join(tmpRoot, fileName);
-          }
-          const stat = await fs.stat(fullPath);
-          return {
-            timestamp: stat.ctime.getTime(),
-            level: 'ALL',
-            message: await fs.readFile(fullPath, 'utf8'),
-          };
-        })
-      ).filter(Boolean));
-    } finally {
-      await fs.rimraf(tmpRoot);
-    }
-  }
-}
-
-export {IOSCrashLog};
-export default IOSCrashLog;