appium-xcuitest-driver 7.21.1 → 7.21.2

package/build/lib/device-log/ios-simulator-log.d.ts

@@ -1,27 +1,24 @@
-export class IOSSimulatorLog extends IOSLog {
-    constructor({ sim, showLogs, xcodeVersion, iosSimulatorLogsPredicate }: {
-        sim: any;
-        showLogs: any;
-        xcodeVersion: any;
-        iosSimulatorLogsPredicate: any;
-    });
-    sim: any;
-    showLogs: boolean;
-    xcodeVersion: any;
-    predicate: any;
-    proc: any;
-    /**
-     * @override
-     */
-    override get isCapturing(): any;
-    /**
-     * @param {string} logRow
-     * @param {string} [prefix='']
-     */
-    onOutput(logRow: string, prefix?: string | undefined): void;
-    killLogSubProcess(): Promise<void>;
-    finishStartingLogCapture(): Promise<void>;
+import { LineConsumingLog } from './line-consuming-log';
+import type { Simulator } from 'appium-ios-simulator';
+import type { AppiumLogger } from '@appium/types';
+export interface IOSSimulatorLogOptions {
+    sim: Simulator;
+    showLogs?: boolean;
+    iosSimulatorLogsPredicate?: string;
+    log?: AppiumLogger;
+}
+export declare class IOSSimulatorLog extends LineConsumingLog {
+    private sim;
+    private showLogs;
+    private predicate?;
+    private proc;
+    constructor(opts: IOSSimulatorLogOptions);
+    startCapture(): Promise<void>;
+    stopCapture(): Promise<void>;
+    get isCapturing(): boolean;
+    private onOutput;
+    private killLogSubProcess;
+    private finishStartingLogCapture;
 }
 export default IOSSimulatorLog;
-import { IOSLog } from './ios-log';
 //# sourceMappingURL=ios-simulator-log.d.ts.map

package/build/lib/device-log/ios-simulator-log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios-simulator-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-simulator-log.js"],"names":[],"mappings":"AAUA;IACE;;;;;OAOC;IALC,SAAc;IACd,kBAA0B;IAC1B,kBAAgC;IAChC,eAA0C;IAC1C,UAAgB;IA4ClB;;OAEG;IACH,gCAEC;IAED;;;OAGG;IACH,iBAHW,MAAM,qCAShB;IAED,mCAcC;IAED,0CAoBC;CACF;;uBApHoB,WAAW"}
+{"version":3,"file":"ios-simulator-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-simulator-log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlD,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,IAAI,CAAoB;gBAEpB,IAAI,EAAE,sBAAsB;IAQzB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3C,IAAa,WAAW,IAAI,OAAO,CAElC;IAED,OAAO,CAAC,QAAQ;YAQF,iBAAiB;YAiBjB,wBAAwB;CAqBvC;AAED,eAAe,eAAe,CAAC"}

package/build/lib/device-log/ios-simulator-log.js

@@ -5,24 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSSimulatorLog = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const ios_log_1 = require("./ios-log");
-const support_1 = require("appium/support");
 const teen_process_1 = require("teen_process");
-const log = support_1.logger.getLogger('IOSSimulatorLog');
+const line_consuming_log_1 = require("./line-consuming-log");
 const EXECVP_ERROR_PATTERN = /execvp\(\)/;
 const START_TIMEOUT = 10000;
-class IOSSimulatorLog extends ios_log_1.IOSLog {
-    constructor({ sim, showLogs, xcodeVersion, iosSimulatorLogsPredicate }) {
-        super();
-        this.sim = sim;
-        this.showLogs = !!showLogs;
-        this.xcodeVersion = xcodeVersion;
-        this.predicate = iosSimulatorLogsPredicate;
+class IOSSimulatorLog extends line_consuming_log_1.LineConsumingLog {
+    constructor(opts) {
+        super({ log: opts.log });
+        this.sim = opts.sim;
+        this.showLogs = !!opts.showLogs;
+        this.predicate = opts.iosSimulatorLogsPredicate;
         this.proc = null;
     }
-    /**
-     * @override
-     */
     async startCapture() {
         if (lodash_1.default.isUndefined(this.sim.udid)) {
             throw new Error(`Log capture requires a sim udid`);
@@ -34,7 +28,7 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
         if (this.predicate) {
             spawnArgs.push('--predicate', this.predicate);
         }
-        log.debug(`Starting log capture for iOS Simulator with udid '${this.sim.udid}' ` + `using simctl`);
+        this.log.debug(`Starting log capture for iOS Simulator with udid '${this.sim.udid}' ` + `using simctl`);
         try {
             // cleanup existing listeners if the previous session has not been terminated properly
             await (0, teen_process_1.exec)('pkill', ['-f', [this.sim.udid, ...spawnArgs].join(' ')]);
@@ -48,9 +42,6 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
             throw new Error(`Simulator log capture failed. Original error: ${e.message}`);
         }
     }
-    /**
-     * @override
-     */
     async stopCapture() {
         if (!this.proc) {
             return;
@@ -58,28 +49,21 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
         await this.killLogSubProcess();
         this.proc = null;
     }
-    /**
-     * @override
-     */
     get isCapturing() {
-        return this.proc && this.proc.isRunning;
+        return Boolean(this.proc && this.proc.isRunning);
     }
-    /**
-     * @param {string} logRow
-     * @param {string} [prefix='']
-     */
     onOutput(logRow, prefix = '') {
         this.broadcast(logRow);
         if (this.showLogs) {
             const space = prefix.length > 0 ? ' ' : '';
-            log.info(`[IOS_SYSLOG_ROW${space}${prefix}] ${logRow}`);
+            this.log.info(`[IOS_SYSLOG_ROW${space}${prefix}] ${logRow}`);
         }
     }
     async killLogSubProcess() {
-        if (!this.proc.isRunning) {
+        if (!this.proc?.isRunning) {
             return;
         }
-        log.debug('Stopping iOS log capture');
+        this.log.debug('Stopping iOS log capture');
         try {
             await this.proc.stop('SIGTERM', 1000);
         }
@@ -87,13 +71,13 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
             if (!this.proc.isRunning) {
                 return;
             }
-            log.warn('Cannot stop log capture process. Sending SIGKILL');
+            this.log.warn('Cannot stop log capture process. Sending SIGKILL');
             await this.proc.stop('SIGKILL');
         }
     }
     async finishStartingLogCapture() {
         if (!this.proc) {
-            log.errorAndThrow('Could not capture simulator log');
+            throw this.log.errorWithException('Could not capture simulator log');
         }
         for (const streamName of ['stdout', 'stderr']) {
             this.proc.on(`lines-${streamName}`, (/** @type {string[]} */ lines) => {

package/build/lib/device-log/ios-simulator-log.js.map

@@ -1 +1 @@
-{"version":3,"file":"ios-simulator-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-simulator-log.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,uCAAiC;AACjC,4CAAsC;AACtC,+CAAkC;AAElC,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;AAChD,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B,MAAa,eAAgB,SAAQ,gBAAM;IACzC,YAAY,EAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,yBAAyB,EAAC;QAClE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,yBAAyB,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY;QAChB,IAAI,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,CAAC;QAC/E,CAAC;QACD,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC;QACD,GAAG,CAAC,KAAK,CACP,qDAAqD,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,cAAc,CACxF,CAAC;QACF,IAAI,CAAC;YACH,sFAAsF;YACtF,MAAM,IAAA,mBAAI,EAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;QAChB,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACxC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE;QAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,IAAI,CAAC,kBAAkB,KAAK,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,GAAG,CAAC,aAAa,CAAC,iCAAiC,CAAC,CAAC;QACvD,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,UAAU,EAAE,EAAE,CAAC,uBAAuB,CAAC,KAAK,EAAE,EAAE;gBACpE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,CAAC,MAAM,EAAE,EAAE;YACnF,IAAI,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,CAAC;YACD,OAAO,MAAM,IAAI,MAAM,CAAC;QAC1B,CAAC,CAAC;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC;CACF;AA3GD,0CA2GC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"ios-simulator-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-simulator-log.ts"],"names":[],"mappings":"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"}

package/build/lib/device-log/line-consuming-log.d.ts

@@ -0,0 +1,9 @@
+import { IOSLog } from './ios-log';
+import type { LogEntry } from '../commands/types';
+type TSerializedEntry = [string, number];
+export declare abstract class LineConsumingLog extends IOSLog<string, TSerializedEntry> {
+    protected _serializeEntry(value: string): TSerializedEntry;
+    protected _deserializeEntry(value: TSerializedEntry): LogEntry;
+}
+export {};
+//# sourceMappingURL=line-consuming-log.d.ts.map

package/build/lib/device-log/line-consuming-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"line-consuming-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/line-consuming-log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAEjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzC,8BAAsB,gBAAiB,SAAQ,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC;cAC1D,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB;cAIhD,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,QAAQ;CAIxE"}

package/build/lib/device-log/line-consuming-log.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LineConsumingLog = void 0;
+const ios_log_1 = require("./ios-log");
+const helpers_1 = require("./helpers");
+class LineConsumingLog extends ios_log_1.IOSLog {
+    _serializeEntry(value) {
+        return [value, Date.now()];
+    }
+    _deserializeEntry(value) {
+        const [message, timestamp] = value;
+        return (0, helpers_1.toLogEntry)(message, timestamp);
+    }
+}
+exports.LineConsumingLog = LineConsumingLog;
+//# sourceMappingURL=line-consuming-log.js.map

package/build/lib/device-log/line-consuming-log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"line-consuming-log.js","sourceRoot":"","sources":["../../../lib/device-log/line-consuming-log.ts"],"names":[],"mappings":";;;AAAA,uCAAiC;AACjC,uCAAuC;AAKvC,MAAsB,gBAAiB,SAAQ,gBAAgC;IAC1D,eAAe,CAAC,KAAa;QAC9C,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7B,CAAC;IAEkB,iBAAiB,CAAC,KAAuB;QAC1D,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC;QACnC,OAAO,IAAA,oBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;CACF;AATD,4CASC"}

package/lib/commands/context.js

@@ -558,7 +558,10 @@ const commands = {
     // attempt to start performance logging, if requested
     if (this.opts.enablePerformanceLogging && this.remote) {
       this.log.debug(`Starting performance log on '${this.curContext}'`);
-      this.logs.performance = new IOSPerformanceLog(this.remote);
+      this.logs.performance = new IOSPerformanceLog({
+        remoteDebugger: this.remote,
+        log: this.log,
+      });
       await this.logs.performance.startCapture();
     }
 

package/lib/commands/log.js

@@ -103,13 +103,14 @@ export default {
         this.logs.syslog = new IOSDeviceLog({
           udid: this.opts.udid,
           showLogs: this.opts.showIOSLog,
+          log: this.log,
         });
       } else {
         this.logs.syslog = new IOSSimulatorLog({
-          sim: this.device,
+          sim: /** @type {import('appium-ios-simulator').Simulator} */ (this.device),
           showLogs: this.opts.showIOSLog,
-          xcodeVersion: this.xcodeVersion,
           iosSimulatorLogsPredicate: this.opts.iosSimulatorLogsPredicate,
+          log: this.log,
         });
       }
       this.logs.safariConsole = new SafariConsoleLog(!!this.opts.showSafariConsoleLog);

package/lib/device-log/ios-device-log.ts

@@ -0,0 +1,52 @@
+import {services} from 'appium-ios-device';
+import { LineConsumingLog } from './line-consuming-log';
+import type { AppiumLogger } from '@appium/types';
+
+export interface IOSDeviceLogOpts {
+  udid: string;
+  showLogs?: boolean;
+  log?: AppiumLogger;
+}
+
+export class IOSDeviceLog extends LineConsumingLog {
+  private udid: string;
+  private showLogs: boolean;
+  private service: any | null;
+
+  constructor(opts: IOSDeviceLogOpts) {
+    super({log: opts.log});
+    this.udid = opts.udid;
+    this.showLogs = !!opts.showLogs;
+    this.service = null;
+  }
+
+  override async startCapture(): Promise<void> {
+    if (this.service) {
+      return;
+    }
+    this.service = await services.startSyslogService(this.udid);
+    this.service.start(this.onLog.bind(this));
+  }
+
+  override get isCapturing(): boolean {
+    return !!this.service;
+  }
+
+  // eslint-disable-next-line require-await
+  override async stopCapture(): Promise<void> {
+    if (!this.service) {
+      return;
+    }
+    this.service.close();
+    this.service = null;
+  }
+
+  private onLog(logLine: string): void {
+    this.broadcast(logLine);
+    if (this.showLogs) {
+      this.log.info(`[IOS_SYSLOG_ROW] ${logLine}`);
+    }
+  }
+}
+
+export default IOSDeviceLog;

package/lib/device-log/ios-log.ts

@@ -0,0 +1,87 @@
+import {EventEmitter} from 'events';
+import { LRUCache } from 'lru-cache';
+import type { LogEntry } from '../commands/types';
+import type { AppiumLogger } from '@appium/types';
+import {logger} from 'appium/support';
+
+// We keep only the most recent log entries to avoid out of memory error
+const MAX_LOG_ENTRIES_COUNT = 10000;
+
+export interface IOSLogOptions {
+  maxBufferSize?: number;
+  log?: AppiumLogger;
+}
+
+export abstract class IOSLog<
+  TRawEntry,
+  TSerializedEntry extends object
+> extends EventEmitter {
+  private maxBufferSize: number;
+  private logs: LRUCache<number, TSerializedEntry>;
+  private logIndexSinceLastRequest: number | null;
+  private _log: AppiumLogger;
+
+  constructor(opts: IOSLogOptions = {}) {
+    super();
+    this.maxBufferSize = opts.maxBufferSize ?? MAX_LOG_ENTRIES_COUNT;
+    this.logs = new LRUCache({
+      max: this.maxBufferSize,
+    });
+    this.logIndexSinceLastRequest = null;
+    this._log = opts.log ?? logger.getLogger(this.constructor.name);
+  }
+
+  abstract startCapture(): Promise<void>;
+  abstract stopCapture(): Promise<void>;
+  abstract get isCapturing(): boolean;
+
+  get log(): AppiumLogger {
+    return this._log;
+  }
+
+  broadcast(entry: TRawEntry): void {
+    let recentIndex = -1;
+    for (const key of this.logs.rkeys()) {
+      recentIndex = key;
+      break;
+    }
+    const serializedEntry = this._serializeEntry(entry);
+    this.logs.set(++recentIndex, serializedEntry);
+    if (this.listenerCount('output')) {
+      this.emit('output', this._deserializeEntry(serializedEntry));
+    }
+  }
+
+  getLogs(): LogEntry[] {
+    const result: LogEntry[] = [];
+    let recentLogIndex: number | null = null;
+    for (const [index, value] of this.logs.entries()) {
+      if (this.logIndexSinceLastRequest && index > this.logIndexSinceLastRequest
+          || !this.logIndexSinceLastRequest) {
+        recentLogIndex = index;
+        result.push(this._deserializeEntry(value));
+      }
+    }
+    if (recentLogIndex !== null) {
+      this.logIndexSinceLastRequest = recentLogIndex;
+    }
+    return result;
+  }
+
+  getAllLogs(): LogEntry[] {
+    const result: LogEntry[] = [];
+    for (const value of this.logs.values()) {
+      result.push(this._deserializeEntry(value));
+    }
+    return result;
+  }
+
+  protected abstract _serializeEntry(value: TRawEntry): TSerializedEntry;
+  protected abstract _deserializeEntry(value: TSerializedEntry): LogEntry;
+
+  protected _clearEntries() {
+    this.logs.clear();
+  }
+}
+
+export default IOSLog;

package/lib/device-log/ios-performance-log.ts

@@ -0,0 +1,61 @@
+import _ from 'lodash';
+import { IOSLog } from './ios-log';
+import type { LogEntry } from '../commands/types';
+import type { AppiumLogger } from '@appium/types';
+
+const MAX_EVENTS = 5000;
+
+type PerformanceLogEntry = object;
+export interface IOSPerformanceLogOptions {
+  remoteDebugger: any;
+  maxEvents?: number;
+  log?: AppiumLogger;
+}
+
+export class IOSPerformanceLog extends IOSLog<PerformanceLogEntry, PerformanceLogEntry> {
+  private remoteDebugger: any;
+  private _started: boolean;
+
+  constructor(opts: IOSPerformanceLogOptions) {
+    super({
+      maxBufferSize: opts.maxEvents ?? MAX_EVENTS,
+      log: opts.log,
+    });
+    this.remoteDebugger = opts.remoteDebugger;
+    this._started = false;
+  }
+
+  override async startCapture(): Promise<void> {
+    this.log.debug('Starting performance (Timeline) log capture');
+    this._clearEntries();
+    const result = await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+    this._started = true;
+    return result;
+  }
+
+  override async stopCapture(): Promise<void> {
+    this.log.debug('Stopping performance (Timeline) log capture');
+    const result = await this.remoteDebugger.stopTimeline();
+    this._started = false;
+    return result;
+  }
+
+  override get isCapturing(): boolean {
+    return this._started;
+  }
+
+  protected override _serializeEntry(value: PerformanceLogEntry): PerformanceLogEntry {
+    return value;
+  }
+
+  protected override _deserializeEntry(value: PerformanceLogEntry): LogEntry {
+    return value as LogEntry;
+  }
+
+  private onTimelineEvent(event: PerformanceLogEntry): void {
+    this.log.debug(`Received Timeline event: ${_.truncate(JSON.stringify(event))}`);
+    this.broadcast(event);
+  }
+}
+
+export default IOSPerformanceLog;

package/lib/device-log/{ios-simulator-log.js → ios-simulator-log.ts}

@@ -1,27 +1,35 @@
 import _ from 'lodash';
-import {IOSLog} from './ios-log';
-import {logger} from 'appium/support';
-import {exec} from 'teen_process';
+import {SubProcess, exec} from 'teen_process';
+import { LineConsumingLog } from './line-consuming-log';
+import type { Simulator } from 'appium-ios-simulator';
+import type { AppiumLogger } from '@appium/types';
 
-const log = logger.getLogger('IOSSimulatorLog');
 const EXECVP_ERROR_PATTERN = /execvp\(\)/;
 
 const START_TIMEOUT = 10000;
 
-export class IOSSimulatorLog extends IOSLog {
-  constructor({sim, showLogs, xcodeVersion, iosSimulatorLogsPredicate}) {
-    super();
-    this.sim = sim;
-    this.showLogs = !!showLogs;
-    this.xcodeVersion = xcodeVersion;
-    this.predicate = iosSimulatorLogsPredicate;
+export interface IOSSimulatorLogOptions {
+  sim: Simulator;
+  showLogs?: boolean;
+  iosSimulatorLogsPredicate?: string;
+  log?: AppiumLogger;
+}
+
+export class IOSSimulatorLog extends LineConsumingLog {
+  private sim: Simulator;
+  private showLogs: boolean;
+  private predicate?: string;
+  private proc: SubProcess | null;
+
+  constructor(opts: IOSSimulatorLogOptions) {
+    super({log: opts.log});
+    this.sim = opts.sim;
+    this.showLogs = !!opts.showLogs;
+    this.predicate = opts.iosSimulatorLogsPredicate;
     this.proc = null;
   }
 
-  /**
-   * @override
-   */
-  async startCapture() {
+  override async startCapture(): Promise<void> {
     if (_.isUndefined(this.sim.udid)) {
       throw new Error(`Log capture requires a sim udid`);
     }
@@ -33,7 +41,7 @@ export class IOSSimulatorLog extends IOSLog {
     if (this.predicate) {
       spawnArgs.push('--predicate', this.predicate);
     }
-    log.debug(
+    this.log.debug(
       `Starting log capture for iOS Simulator with udid '${this.sim.udid}' ` + `using simctl`,
     );
     try {
@@ -48,10 +56,7 @@ export class IOSSimulatorLog extends IOSLog {
     }
   }
 
-  /**
-   * @override
-   */
-  async stopCapture() {
+  override async stopCapture(): Promise<void> {
     if (!this.proc) {
       return;
     }
@@ -59,44 +64,38 @@ export class IOSSimulatorLog extends IOSLog {
     this.proc = null;
   }
 
-  /**
-   * @override
-   */
-  get isCapturing() {
-    return this.proc && this.proc.isRunning;
+  override get isCapturing(): boolean {
+    return Boolean(this.proc && this.proc.isRunning);
   }
 
-  /**
-   * @param {string} logRow
-   * @param {string} [prefix='']
-   */
-  onOutput(logRow, prefix = '') {
+  private onOutput(logRow: string, prefix: string = ''): void {
     this.broadcast(logRow);
     if (this.showLogs) {
       const space = prefix.length > 0 ? ' ' : '';
-      log.info(`[IOS_SYSLOG_ROW${space}${prefix}] ${logRow}`);
+      this.log.info(`[IOS_SYSLOG_ROW${space}${prefix}] ${logRow}`);
     }
   }
 
-  async killLogSubProcess() {
-    if (!this.proc.isRunning) {
+  private async killLogSubProcess(): Promise<void> {
+    if (!this.proc?.isRunning) {
       return;
     }
-    log.debug('Stopping iOS log capture');
+
+    this.log.debug('Stopping iOS log capture');
     try {
       await this.proc.stop('SIGTERM', 1000);
     } catch (e) {
       if (!this.proc.isRunning) {
         return;
       }
-      log.warn('Cannot stop log capture process. Sending SIGKILL');
+      this.log.warn('Cannot stop log capture process. Sending SIGKILL');
       await this.proc.stop('SIGKILL');
     }
   }
 
-  async finishStartingLogCapture() {
+  private async finishStartingLogCapture() {
     if (!this.proc) {
-      log.errorAndThrow('Could not capture simulator log');
+      throw this.log.errorWithException('Could not capture simulator log');
     }
 
     for (const streamName of ['stdout', 'stderr']) {

package/lib/device-log/line-consuming-log.ts

@@ -0,0 +1,16 @@
+import {IOSLog} from './ios-log';
+import { toLogEntry } from './helpers';
+import type { LogEntry } from '../commands/types';
+
+type TSerializedEntry = [string, number];
+
+export abstract class LineConsumingLog extends IOSLog<string, TSerializedEntry> {
+  protected override _serializeEntry(value: string): TSerializedEntry {
+    return [value, Date.now()];
+  }
+
+  protected override _deserializeEntry(value: TSerializedEntry): LogEntry {
+    const [message, timestamp] = value;
+    return toLogEntry(message, timestamp);
+  }
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "7.21.1",
+  "version": "7.21.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "7.21.1",
+      "version": "7.21.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@colors/colors": "^1.6.0",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.21.1",
+  "version": "7.21.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {

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

@@ -1,56 +0,0 @@
-import {logger} from 'appium/support';
-import {IOSLog} from './ios-log';
-import {services} from 'appium-ios-device';
-
-const log = logger.getLogger('IOSDeviceLog');
-
-export class IOSDeviceLog extends IOSLog {
-  constructor(opts) {
-    super();
-    this.udid = opts.udid;
-    this.showLogs = !!opts.showLogs;
-    this.service = null;
-  }
-  /**
-   * @override
-   */
-  async startCapture() {
-    if (this.service) {
-      return;
-    }
-    this.service = await services.startSyslogService(this.udid);
-    this.service.start(this.onLog.bind(this));
-  }
-
-  /**
-   * @param {string} logLine
-   */
-  onLog(logLine) {
-    this.broadcast(logLine);
-    if (this.showLogs) {
-      log.info(logLine);
-    }
-  }
-
-  /**
-   * @override
-   */
-  get isCapturing() {
-    return !!this.service;
-  }
-
-  /**
-   * @override
-   */
-  // XXX: superclass is async, but this is not
-  // eslint-disable-next-line require-await
-  async stopCapture() {
-    if (!this.service) {
-      return;
-    }
-    this.service.close();
-    this.service = null;
-  }
-}
-
-export default IOSDeviceLog;