appium-xcuitest-driver 7.21.0 → 7.21.2

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

@@ -2,57 +2,59 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSLog = void 0;
 const events_1 = require("events");
+const lru_cache_1 = require("lru-cache");
+const support_1 = require("appium/support");
 // We keep only the most recent log entries to avoid out of memory error
 const MAX_LOG_ENTRIES_COUNT = 10000;
 class IOSLog extends events_1.EventEmitter {
-    constructor() {
+    constructor(opts = {}) {
         super();
-        this.logs = [];
-        this.logIdxSinceLastRequest = -1;
-        this.maxBufferSize = MAX_LOG_ENTRIES_COUNT;
+        this.maxBufferSize = opts.maxBufferSize ?? MAX_LOG_ENTRIES_COUNT;
+        this.logs = new lru_cache_1.LRUCache({
+            max: this.maxBufferSize,
+        });
+        this.logIndexSinceLastRequest = null;
+        this._log = opts.log ?? support_1.logger.getLogger(this.constructor.name);
     }
-    /** @returns {Promise<void>} */
-    // eslint-disable-next-line require-await
-    async startCapture() {
-        throw new Error(`Sub-classes need to implement a 'startCapture' function`);
+    get log() {
+        return this._log;
     }
-    /** @returns {Promise<void>} */
-    // eslint-disable-next-line require-await
-    async stopCapture() {
-        throw new Error(`Sub-classes need to implement a 'stopCapture' function`);
-    }
-    /** @returns {boolean} */
-    get isCapturing() {
-        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;
-            }
+    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));
         }
     }
     getLogs() {
-        if (this.logs.length && this.logIdxSinceLastRequest < this.logs.length) {
-            let result = this.logs;
-            if (this.logIdxSinceLastRequest > 0) {
-                result = result.slice(this.logIdxSinceLastRequest);
+        const result = [];
+        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;
     }
     getAllLogs() {
-        return this.logs;
+        const result = [];
+        for (const value of this.logs.values()) {
+            result.push(this._deserializeEntry(value));
+        }
+        return result;
+    }
+    _clearEntries() {
+        this.logs.clear();
     }
 }
 exports.IOSLog = IOSLog;

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

@@ -1 +1 @@
-{"version":3,"file":"ios-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-log.js"],"names":[],"mappings":";;;AAAA,mCAAoC;AAEpC,wEAAwE;AACxE,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAEpC,MAAM,MAAO,SAAQ,qBAAY;IAC/B;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,qBAAqB,CAAC;IAC7C,CAAC;IAED,+BAA+B;IAC/B,yCAAyC;IACzC,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,+BAA+B;IAC/B,yCAAyC;IACzC,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,yBAAyB;IACzB,IAAI,WAAW;QACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,SAAS,CAAC,OAAO;QACf,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,OAAO;SACjB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,sBAAsB,GAAG,CAAC,EAAE,CAAC;gBACpC,EAAE,IAAI,CAAC,sBAAsB,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACvE,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,IAAI,IAAI,CAAC,sBAAsB,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACrD,CAAC;YACD,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF;AAEO,wBAAM;AACd,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"ios-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-log.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,yCAAqC;AAGrC,4CAAsC;AAEtC,wEAAwE;AACxE,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAOpC,MAAsB,MAGpB,SAAQ,qBAAY;IAMpB,YAAY,OAAsB,EAAE;QAClC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,qBAAqB,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,IAAI,oBAAQ,CAAC;YACvB,GAAG,EAAE,IAAI,CAAC,aAAa;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAMD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,SAAS,CAAC,KAAgB;QACxB,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YACpC,WAAW,GAAG,GAAG,CAAC;YAClB,MAAM;QACR,CAAC;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QAC9C,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,wBAAwB,IAAI,KAAK,GAAG,IAAI,CAAC,wBAAwB;mBACnE,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBACtC,cAAc,GAAG,KAAK,CAAC;gBACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QACD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,wBAAwB,GAAG,cAAc,CAAC;QACjD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU;QACR,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAKS,aAAa;QACrB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;CACF;AAtED,wBAsEC;AAED,kBAAe,MAAM,CAAC"}

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

@@ -1,13 +1,22 @@
-export default IOSPerformanceLog;
-export class IOSPerformanceLog {
-    constructor(remoteDebugger: any, maxEvents?: number);
+import { IOSLog } from './ios-log';
+import type { LogEntry } from '../commands/types';
+import type { AppiumLogger } from '@appium/types';
+type PerformanceLogEntry = object;
+export interface IOSPerformanceLogOptions {
     remoteDebugger: any;
-    maxEvents: number;
-    timelineEvents: any[];
-    startCapture(): Promise<any>;
-    stopCapture(): Promise<any>;
-    onTimelineEvent(event: any): void;
-    getLogs(): Promise<any[]>;
-    getAllLogs(): Promise<any[]>;
+    maxEvents?: number;
+    log?: AppiumLogger;
+}
+export declare class IOSPerformanceLog extends IOSLog<PerformanceLogEntry, PerformanceLogEntry> {
+    private remoteDebugger;
+    private _started;
+    constructor(opts: IOSPerformanceLogOptions);
+    startCapture(): Promise<void>;
+    stopCapture(): Promise<void>;
+    get isCapturing(): boolean;
+    protected _serializeEntry(value: PerformanceLogEntry): PerformanceLogEntry;
+    protected _deserializeEntry(value: PerformanceLogEntry): LogEntry;
+    private onTimelineEvent;
 }
+export default IOSPerformanceLog;
 //# sourceMappingURL=ios-performance-log.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ios-performance-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-performance-log.js"],"names":[],"mappings":";AAMA;IACE,qDAKC;IAJC,oBAAoC;IACpC,kBAAgD;IAEhD,sBAAwB;IAG1B,6BAIC;IAED,4BAGC;IAED,kCAWC;IAGD,0BAQC;IAGD,6BAEC;CACF"}
+{"version":3,"file":"ios-performance-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-performance-log.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAIlD,KAAK,mBAAmB,GAAG,MAAM,CAAC;AAClC,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AAED,qBAAa,iBAAkB,SAAQ,MAAM,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACrF,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,QAAQ,CAAU;gBAEd,IAAI,EAAE,wBAAwB;IAS3B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3C,IAAa,WAAW,IAAI,OAAO,CAElC;cAEkB,eAAe,CAAC,KAAK,EAAE,mBAAmB,GAAG,mBAAmB;cAIhE,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ;IAI1E,OAAO,CAAC,eAAe;CAIxB;AAED,eAAe,iBAAiB,CAAC"}

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

@@ -4,45 +4,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSPerformanceLog = void 0;
-const support_1 = require("appium/support");
 const lodash_1 = __importDefault(require("lodash"));
-const log = support_1.logger.getLogger('IOSPerformanceLog');
+const ios_log_1 = require("./ios-log");
 const MAX_EVENTS = 5000;
-class IOSPerformanceLog {
-    constructor(remoteDebugger, maxEvents = MAX_EVENTS) {
-        this.remoteDebugger = remoteDebugger;
-        this.maxEvents = parseInt(String(maxEvents), 10);
-        this.timelineEvents = [];
+class IOSPerformanceLog extends ios_log_1.IOSLog {
+    constructor(opts) {
+        super({
+            maxBufferSize: opts.maxEvents ?? MAX_EVENTS,
+            log: opts.log,
+        });
+        this.remoteDebugger = opts.remoteDebugger;
+        this._started = false;
     }
     async startCapture() {
-        log.debug('Starting performance (Timeline) log capture');
-        this.timelineEvents = [];
-        return await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+        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;
     }
     async stopCapture() {
-        log.debug('Stopping performance (Timeline) log capture');
-        return await this.remoteDebugger.stopTimeline();
+        this.log.debug('Stopping performance (Timeline) log capture');
+        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))}`);
-        }
+    get isCapturing() {
+        return this._started;
+    }
+    _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;
+    _deserializeEntry(value) {
+        return value;
     }
-    // eslint-disable-next-line require-await
-    async getAllLogs() {
-        return this.getLogs();
+    onTimelineEvent(event) {
+        this.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.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,uCAAmC;AAInC,MAAM,UAAU,GAAG,IAAI,CAAC;AASxB,MAAa,iBAAkB,SAAQ,gBAAgD;IAIrF,YAAY,IAA8B;QACxC,KAAK,CAAC;YACJ,aAAa,EAAE,IAAI,CAAC,SAAS,IAAI,UAAU;YAC3C,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAEQ,KAAK,CAAC,YAAY;QACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC9D,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;IAEQ,KAAK,CAAC,WAAW;QACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC9D,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,IAAa,WAAW;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEkB,eAAe,CAAC,KAA0B;QAC3D,OAAO,KAAK,CAAC;IACf,CAAC;IAEkB,iBAAiB,CAAC,KAA0B;QAC7D,OAAO,KAAiB,CAAC;IAC3B,CAAC;IAEO,eAAe,CAAC,KAA0B;QAChD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AA5CD,8CA4CC;AAED,kBAAe,iBAAiB,CAAC"}

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

@@ -1,20 +1,24 @@
-export default IOSSimulatorLog;
-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;
-    finishStartingLogCapture(): Promise<void>;
-    killLogSubProcess(): Promise<void>;
-    get isCapturing(): any;
-    onOutput(logRow: any, prefix?: string): 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;
 }
-import { IOSLog } from './ios-log';
+export default IOSSimulatorLog;
 //# 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.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,18 +5,16 @@ 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;
     }
     async startCapture() {
@@ -30,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(' ')]);
@@ -44,40 +42,6 @@ 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);
-    }
     async stopCapture() {
         if (!this.proc) {
             return;
@@ -85,11 +49,21 @@ class IOSSimulatorLog extends ios_log_1.IOSLog {
         await this.killLogSubProcess();
         this.proc = null;
     }
+    get isCapturing() {
+        return Boolean(this.proc && this.proc.isRunning);
+    }
+    onOutput(logRow, prefix = '') {
+        this.broadcast(logRow);
+        if (this.showLogs) {
+            const space = prefix.length > 0 ? ' ' : '';
+            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);
         }
@@ -97,24 +71,28 @@ 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');
         }
     }
-    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) {
+            throw this.log.errorWithException('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.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

@@ -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,
   /**
@@ -111,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/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,
+  };
+}