appium-xcuitest-driver 7.21.0 → 7.21.1

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

@@ -6,43 +6,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSPerformanceLog = void 0;
 const support_1 = require("appium/support");
 const lodash_1 = __importDefault(require("lodash"));
+const ios_log_1 = require("./ios-log");
 const log = support_1.logger.getLogger('IOSPerformanceLog');
 const MAX_EVENTS = 5000;
-class IOSPerformanceLog {
+class IOSPerformanceLog extends ios_log_1.IOSLog {
     constructor(remoteDebugger, maxEvents = MAX_EVENTS) {
+        super(maxEvents);
         this.remoteDebugger = remoteDebugger;
         this.maxEvents = parseInt(String(maxEvents), 10);
-        this.timelineEvents = [];
+        this._started = false;
     }
+    /**
+     * @override
+     */
     async startCapture() {
         log.debug('Starting performance (Timeline) log capture');
-        this.timelineEvents = [];
-        return await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+        this._clearEntries();
+        const result = await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+        this._started = true;
+        return result;
     }
+    /**
+     * @override
+     */
     async stopCapture() {
         log.debug('Stopping performance (Timeline) log capture');
-        return await this.remoteDebugger.stopTimeline();
+        const result = await this.remoteDebugger.stopTimeline();
+        this._started = false;
+        return result;
     }
-    onTimelineEvent(event) {
-        log.debug(`Received Timeline event: ${lodash_1.default.truncate(JSON.stringify(event))}`);
-        this.timelineEvents.push(event);
-        // if we have too many, get rid of the oldest log line
-        if (this.timelineEvents.length > this.maxEvents) {
-            let removedEvent = this.timelineEvents.shift();
-            log.warn(`Too many Timeline events, removing earliest: ${lodash_1.default.truncate(JSON.stringify(removedEvent))}`);
-        }
+    /**
+     * @override
+     */
+    get isCapturing() {
+        return this._started;
+    }
+    /**
+     * @override
+     */
+    _serializeEntry(value) {
+        return value;
     }
-    // eslint-disable-next-line require-await
-    async getLogs() {
-        let events = this.timelineEvents;
-        // flush events
-        log.debug('Flushing Timeline events');
-        this.timelineEvents = [];
-        return events;
+    /**
+     * @override
+     */
+    _deserializeEntry(value) {
+        return value;
     }
-    // eslint-disable-next-line require-await
-    async getAllLogs() {
-        return this.getLogs();
+    /**
+     *
+     * @param {import('../commands/types').LogEntry} event
+     */
+    onTimelineEvent(event) {
+        log.debug(`Received Timeline event: ${lodash_1.default.truncate(JSON.stringify(event))}`);
+        this.broadcast(event);
     }
 }
 exports.IOSPerformanceLog = IOSPerformanceLog;

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

@@ -1 +1 @@
-{"version":3,"file":"ios-performance-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-performance-log.js"],"names":[],"mappings":";;;;;;AAAA,4CAAsC;AACtC,oDAAuB;AAEvB,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;AAClD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,iBAAiB;IACrB,YAAY,cAAc,EAAE,SAAS,GAAG,UAAU;QAChD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAEjD,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,WAAW;QACf,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACzD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;IAClD,CAAC;IAED,eAAe,CAAC,KAAK;QACnB,GAAG,CAAC,KAAK,CAAC,4BAA4B,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEhC,sDAAsD;QACtD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChD,IAAI,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAC/C,GAAG,CAAC,IAAI,CACN,gDAAgD,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,CAC3F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO;QACX,IAAI,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC;QAEjC,eAAe;QACf,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;CACF;AAEO,8CAAiB;AACzB,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"ios-performance-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-performance-log.js"],"names":[],"mappings":";;;;;;AAAA,4CAAsC;AACtC,oDAAuB;AACvB,uCAAmC;AAEnC,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;AAClD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAa,iBAAkB,SAAQ,gBAAM;IAC3C,YAAY,cAAc,EAAE,SAAS,GAAG,UAAU;QAChD,KAAK,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY;QAChB,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW;QACf,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACxD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,KAAK;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,KAAK;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,KAAK;QACnB,GAAG,CAAC,KAAK,CAAC,4BAA4B,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AA1DD,8CA0DC;AAED,kBAAe,iBAAiB,CAAC"}

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

@@ -1,4 +1,3 @@
-export default IOSSimulatorLog;
 export class IOSSimulatorLog extends IOSLog {
     constructor({ sim, showLogs, xcodeVersion, iosSimulatorLogsPredicate }: {
         sim: any;
@@ -11,10 +10,18 @@ export class IOSSimulatorLog extends IOSLog {
     xcodeVersion: any;
     predicate: any;
     proc: any;
-    finishStartingLogCapture(): Promise<void>;
+    /**
+     * @override
+     */
+    override get isCapturing(): any;
+    /**
+     * @param {string} logRow
+     * @param {string} [prefix='']
+     */
+    onOutput(logRow: string, prefix?: string | undefined): void;
     killLogSubProcess(): Promise<void>;
-    get isCapturing(): any;
-    onOutput(logRow: any, prefix?: string): void;
+    finishStartingLogCapture(): Promise<void>;
 }
+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":";AASA;IACE;;;;;OAOC;IALC,SAAc;IACd,kBAA0B;IAC1B,kBAAgC;IAChC,eAA0C;IAC1C,UAAgB;IA8BlB,0CAiCC;IAUD,mCAcC;IAED,uBAEC;IAED,6CAUC;CACF;uBAvHoB,WAAW"}
+{"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"}

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

@@ -9,6 +9,7 @@ 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 EXECVP_ERROR_PATTERN = /execvp\(\)/;
 const START_TIMEOUT = 10000;
 class IOSSimulatorLog extends ios_log_1.IOSLog {
     constructor({ sim, showLogs, xcodeVersion, iosSimulatorLogsPredicate }) {
@@ -19,6 +20,9 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
         this.predicate = iosSimulatorLogsPredicate;
         this.proc = null;
     }
+    /**
+     * @override
+     */
     async startCapture() {
         if (lodash_1.default.isUndefined(this.sim.udid)) {
             throw new Error(`Log capture requires a sim udid`);
@@ -44,40 +48,9 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
             throw new Error(`Simulator log capture failed. Original error: ${e.message}`);
         }
     }
-    async finishStartingLogCapture() {
-        if (!this.proc) {
-            log.errorAndThrow('Could not capture simulator log');
-        }
-        let firstLine = true;
-        let logRow = '';
-        this.proc.on('output', (stdout, stderr) => {
-            if (stdout) {
-                if (firstLine) {
-                    if (stdout.endsWith('\n')) {
-                        // don't store the first line of the log because it came before the sim was launched
-                        firstLine = false;
-                    }
-                }
-                else {
-                    logRow += stdout;
-                    if (stdout.endsWith('\n')) {
-                        this.onOutput(logRow);
-                        logRow = '';
-                    }
-                }
-            }
-            if (stderr) {
-                this.onOutput(logRow, 'STDERR');
-            }
-        });
-        let sd = (stdout, stderr) => {
-            if (/execvp\(\)/.test(stderr)) {
-                throw new Error('iOS log capture process failed to start');
-            }
-            return stdout || stderr;
-        };
-        await this.proc.start(sd, START_TIMEOUT);
-    }
+    /**
+     * @override
+     */
     async stopCapture() {
         if (!this.proc) {
             return;
@@ -85,6 +58,23 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
         await this.killLogSubProcess();
         this.proc = null;
     }
+    /**
+     * @override
+     */
+    get isCapturing() {
+        return 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}`);
+        }
+    }
     async killLogSubProcess() {
         if (!this.proc.isRunning) {
             return;
@@ -101,20 +91,24 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
             await this.proc.stop('SIGKILL');
         }
     }
-    get isCapturing() {
-        return this.proc && this.proc.isRunning;
-    }
-    onOutput(logRow, prefix = '') {
-        const logs = lodash_1.default.cloneDeep(logRow.split('\n'));
-        for (const logLine of logs) {
-            if (!logLine)
-                continue; // eslint-disable-line curly
-            this.broadcast(logLine);
-            if (this.showLogs) {
-                const space = prefix.length > 0 ? ' ' : '';
-                log.info(`[IOS_SYSLOG_ROW${space}${prefix}] ${logLine}`);
-            }
+    async finishStartingLogCapture() {
+        if (!this.proc) {
+            log.errorAndThrow('Could not capture simulator log');
+        }
+        for (const streamName of ['stdout', 'stderr']) {
+            this.proc.on(`lines-${streamName}`, (/** @type {string[]} */ lines) => {
+                for (const line of lines) {
+                    this.onOutput(line, ...(streamName === 'stderr' ? ['STDERR'] : []));
+                }
+            });
         }
+        const startDetector = (/** @type {string} */ stdout, /** @type {string} */ stderr) => {
+            if (EXECVP_ERROR_PATTERN.test(stderr)) {
+                throw new Error('iOS log capture process failed to start');
+            }
+            return stdout || stderr;
+        };
+        await this.proc.start(startDetector, START_TIMEOUT);
     }
 }
 exports.IOSSimulatorLog = IOSSimulatorLog;

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":"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"}
+{"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"}

package/lib/commands/log.js

@@ -8,6 +8,7 @@ import log from '../logger';
 import WebSocket from 'ws';
 import SafariConsoleLog from '../device-log/safari-console-log';
 import SafariNetworkLog from '../device-log/safari-network-log';
+import { toLogEntry } from '../device-log/helpers';
 
 /**
  * Determines the websocket endpoint based on the `sessionId`
@@ -47,27 +48,18 @@ const SUPPORTED_LOG_TYPES = {
   server: {
     description: 'Appium server logs',
     /**
-     * @returns {AppiumServerLogEntry[]}
+     * @returns {import('./types').LogEntry[]}
      */
     getter: (self) => {
       self.assertFeatureEnabled(GET_SERVER_LOGS_FEATURE);
-      return log.unwrap().record.map((x) => ({
-        timestamp: /** @type {any} */ (x).timestamp ?? Date.now(),
-        level: 'ALL',
-        message: _.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`,
-      }));
+      return log.unwrap().record.map((x) => toLogEntry(
+        _.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`,
+        /** @type {any} */ (x).timestamp ?? Date.now()
+      ));
     },
   },
 };
 
-/**
- * Log entry in the array returned by `getLogs('server')`
- * @typedef AppiumServerLogEntry
- * @property {number} timestamp
- * @property {'ALL'} level
- * @property {string} message
- */
-
 export default {
   supportedLogTypes: SUPPORTED_LOG_TYPES,
   /**

package/lib/commands/types.ts

@@ -566,3 +566,9 @@ export interface KeyboardKey {
    */
   modifierFlags?: number;
 }
+
+export interface LogEntry {
+  timestamp: number;
+  level: string,
+  message: string;
+}

package/lib/device-log/helpers.ts

@@ -0,0 +1,9 @@
+import type { LogEntry } from '../commands/types';
+
+export function toLogEntry(message: string, timestamp: number): LogEntry {
+  return {
+    timestamp,
+    level: 'ALL',
+    message,
+  };
+}

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

@@ -11,13 +11,6 @@ const MAGIC_SEP = '/';
 // The file format has been changed from '.crash' to '.ips' since Monterey.
 const CRASH_REPORTS_GLOB_PATTERN = '**/*.@(crash|ips)';
 
-/**
- * @typedef {Object} LogRecord
- * @property {number} timestamp
- * @property {string} level
- * @property {string} message
- */
-
 class IOSCrashLog {
   constructor(opts = {}) {
     this.udid = opts.udid;
@@ -103,7 +96,7 @@ class IOSCrashLog {
   }
 
   /**
-   * @returns {Promise<LogRecord[]>}
+   * @returns {Promise<import('../commands/types').LogEntry[]>}
    */
   async getLogs() {
     let crashFiles = await this.getCrashes();
@@ -113,7 +106,7 @@ class IOSCrashLog {
   }
 
   /**
-   * @returns {Promise<LogRecord[]>}
+   * @returns {Promise<import('../commands/types').LogEntry[]>}
    */
   async getAllLogs() {
     let crashFiles = await this.getCrashes();
@@ -123,12 +116,12 @@ class IOSCrashLog {
 
   /**
    * @param {string[]} paths
-   * @returns {Promise<LogRecord[]>}
+   * @returns {Promise<import('../commands/types').LogEntry[]>}
    */
   async filesToJSON(paths) {
     const tmpRoot = await tempDir.openDir();
     try {
-      return /** @type {LogRecord[]} */ ((
+      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)));

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

@@ -4,7 +4,7 @@ import {services} from 'appium-ios-device';
 
 const log = logger.getLogger('IOSDeviceLog');
 
-class IOSDeviceLog extends IOSLog {
+export class IOSDeviceLog extends IOSLog {
   constructor(opts) {
     super();
     this.udid = opts.udid;
@@ -22,6 +22,9 @@ class IOSDeviceLog extends IOSLog {
     this.service.start(this.onLog.bind(this));
   }
 
+  /**
+   * @param {string} logLine
+   */
   onLog(logLine) {
     this.broadcast(logLine);
     if (this.showLogs) {
@@ -50,5 +53,4 @@ class IOSDeviceLog extends IOSLog {
   }
 }
 
-export {IOSDeviceLog};
 export default IOSDeviceLog;

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

@@ -1,14 +1,22 @@
 import {EventEmitter} from 'events';
+import { LRUCache } from 'lru-cache';
+import { toLogEntry } from './helpers';
 
 // We keep only the most recent log entries to avoid out of memory error
 const MAX_LOG_ENTRIES_COUNT = 10000;
 
-class IOSLog extends EventEmitter {
-  constructor() {
+// TODO: Rewrite this class to typescript for better generic typing
+
+export class IOSLog extends EventEmitter {
+  constructor(maxBufferSize = MAX_LOG_ENTRIES_COUNT) {
     super();
-    this.logs = [];
-    this.logIdxSinceLastRequest = -1;
-    this.maxBufferSize = MAX_LOG_ENTRIES_COUNT;
+    this.maxBufferSize = maxBufferSize;
+    /** @type {LRUCache<number, any>} */
+    this.logs = new LRUCache({
+      max: this.maxBufferSize,
+    });
+    /** @type {number?} */
+    this.logIndexSinceLastRequest = null;
   }
 
   /** @returns {Promise<void>} */
@@ -28,38 +36,81 @@ class IOSLog extends EventEmitter {
     throw new Error(`Sub-classes need to implement a 'isCapturing' function`);
   }
 
-  broadcast(logLine) {
-    const logObj = {
-      timestamp: Date.now(),
-      level: 'ALL',
-      message: logLine,
-    };
-    this.logs.push(logObj);
-    this.emit('output', logObj);
-    if (this.logs.length > this.maxBufferSize) {
-      this.logs.shift();
-      if (this.logIdxSinceLastRequest > 0) {
-        --this.logIdxSinceLastRequest;
-      }
+  /**
+   *
+   * @param {any} entry
+   * @returns {void}
+   */
+  broadcast(entry) {
+    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));
     }
   }
 
+  /**
+   *
+   * @returns {import('../commands/types').LogEntry[]}
+   */
   getLogs() {
-    if (this.logs.length && this.logIdxSinceLastRequest < this.logs.length) {
-      let result = this.logs;
-      if (this.logIdxSinceLastRequest > 0) {
-        result = result.slice(this.logIdxSinceLastRequest);
+    /** @type {import('../commands/types').LogEntry[]} */
+    const result = [];
+    /** @type {number?} */
+    let recentLogIndex = null;
+    for (const [index, value] of this.logs.entries()) {
+      if (this.logIndexSinceLastRequest && index > this.logIndexSinceLastRequest
+          || !this.logIndexSinceLastRequest) {
+        recentLogIndex = index;
+        result.push(this._deserializeEntry(value));
       }
-      this.logIdxSinceLastRequest = this.logs.length;
-      return result;
     }
-    return [];
+    if (recentLogIndex !== null) {
+      this.logIndexSinceLastRequest = recentLogIndex;
+    }
+    return result;
   }
 
+  /**
+   *
+   * @returns {import('../commands/types').LogEntry[]}
+   */
   getAllLogs() {
-    return this.logs;
+    /** @type {import('../commands/types').LogEntry[]} */
+    const result = [];
+    for (const value of this.logs.values()) {
+      result.push(this._deserializeEntry(value));
+    }
+    return result;
+  }
+
+  /**
+   *
+   * @param {any} value
+   * @returns {any}
+   */
+  _serializeEntry(value) {
+    return [value, Date.now()];
+  }
+
+  /**
+   *
+   * @param {any} value
+   * @returns {any}
+   */
+  _deserializeEntry(value) {
+    const [message, timestamp] = value;
+    return toLogEntry(message, timestamp);
+  }
+
+  _clearEntries() {
+    this.logs.clear();
   }
 }
 
-export {IOSLog};
 export default IOSLog;

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

@@ -1,57 +1,68 @@
 import {logger} from 'appium/support';
 import _ from 'lodash';
+import { IOSLog } from './ios-log';
 
 const log = logger.getLogger('IOSPerformanceLog');
 const MAX_EVENTS = 5000;
 
-class IOSPerformanceLog {
+export class IOSPerformanceLog extends IOSLog {
   constructor(remoteDebugger, maxEvents = MAX_EVENTS) {
+    super(maxEvents);
     this.remoteDebugger = remoteDebugger;
     this.maxEvents = parseInt(String(maxEvents), 10);
-
-    this.timelineEvents = [];
+    this._started = false;
   }
 
+  /**
+   * @override
+   */
   async startCapture() {
     log.debug('Starting performance (Timeline) log capture');
-    this.timelineEvents = [];
-    return await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+    this._clearEntries();
+    const result = await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+    this._started = true;
+    return result;
   }
 
+  /**
+   * @override
+   */
   async stopCapture() {
     log.debug('Stopping performance (Timeline) log capture');
-    return await this.remoteDebugger.stopTimeline();
+    const result = await this.remoteDebugger.stopTimeline();
+    this._started = false;
+    return result;
   }
 
-  onTimelineEvent(event) {
-    log.debug(`Received Timeline event: ${_.truncate(JSON.stringify(event))}`);
-    this.timelineEvents.push(event);
-
-    // if we have too many, get rid of the oldest log line
-    if (this.timelineEvents.length > this.maxEvents) {
-      let removedEvent = this.timelineEvents.shift();
-      log.warn(
-        `Too many Timeline events, removing earliest: ${_.truncate(JSON.stringify(removedEvent))}`,
-      );
-    }
+  /**
+   * @override
+   */
+  get isCapturing() {
+    return this._started;
   }
 
-  // eslint-disable-next-line require-await
-  async getLogs() {
-    let events = this.timelineEvents;
-
-    // flush events
-    log.debug('Flushing Timeline events');
-    this.timelineEvents = [];
+  /**
+   * @override
+   */
+  _serializeEntry(value) {
+    return value;
+  }
 
-    return events;
+  /**
+   * @override
+   */
+  _deserializeEntry(value) {
+    return value;
   }
 
-  // eslint-disable-next-line require-await
-  async getAllLogs() {
-    return this.getLogs();
+  /**
+   *
+   * @param {import('../commands/types').LogEntry} event
+   */
+  onTimelineEvent(event) {
+    log.debug(`Received Timeline event: ${_.truncate(JSON.stringify(event))}`);
+    this.broadcast(event);
   }
 }
 
-export {IOSPerformanceLog};
 export default IOSPerformanceLog;