appium-xcuitest-driver 7.21.1 → 7.22.0

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

@@ -3,43 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSLog = void 0;
 const events_1 = require("events");
 const lru_cache_1 = require("lru-cache");
-const helpers_1 = require("./helpers");
+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;
-// TODO: Rewrite this class to typescript for better generic typing
 class IOSLog extends events_1.EventEmitter {
-    constructor(maxBufferSize = MAX_LOG_ENTRIES_COUNT) {
+    constructor(opts = {}) {
         super();
-        this.maxBufferSize = maxBufferSize;
-        /** @type {LRUCache<number, any>} */
+        this.maxBufferSize = opts.maxBufferSize ?? MAX_LOG_ENTRIES_COUNT;
         this.logs = new lru_cache_1.LRUCache({
             max: this.maxBufferSize,
         });
-        /** @type {number?} */
-        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`);
+    getLogs() {
+        const result = [];
+        for (const value of this.logs.rvalues()) {
+            result.push(this._deserializeEntry(value));
+        }
+        this._clearEntries();
+        return result;
     }
-    /** @returns {boolean} */
-    get isCapturing() {
-        throw new Error(`Sub-classes need to implement a 'isCapturing' function`);
+    _clearEntries() {
+        this.logs.clear();
     }
-    /**
-     *
-     * @param {any} entry
-     * @returns {void}
-     */
     broadcast(entry) {
         let recentIndex = -1;
-        for (const key of this.logs.rkeys()) {
+        for (const key of this.logs.keys()) {
             recentIndex = key;
             break;
         }
@@ -49,59 +41,6 @@ class IOSLog extends events_1.EventEmitter {
             this.emit('output', this._deserializeEntry(serializedEntry));
         }
     }
-    /**
-     *
-     * @returns {import('../commands/types').LogEntry[]}
-     */
-    getLogs() {
-        /** @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));
-            }
-        }
-        if (recentLogIndex !== null) {
-            this.logIndexSinceLastRequest = recentLogIndex;
-        }
-        return result;
-    }
-    /**
-     *
-     * @returns {import('../commands/types').LogEntry[]}
-     */
-    getAllLogs() {
-        /** @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 (0, helpers_1.toLogEntry)(message, timestamp);
-    }
-    _clearEntries() {
-        this.logs.clear();
-    }
 }
 exports.IOSLog = IOSLog;
 exports.default = 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":"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"}
+{"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;IAKpB,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,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,OAAO;QACL,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAyB,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAKS,aAAa;QACrB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;IAES,SAAS,CAAC,KAAgB;QAClC,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QACrB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACnC,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;CACF;AArDD,wBAqDC;AAED,kBAAe,MAAM,CAAC"}

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

@@ -1,30 +1,18 @@
-export class IOSPerformanceLog extends IOSLog {
-    constructor(remoteDebugger: any, maxEvents?: number);
+import type { AppiumLogger } from '@appium/types';
+import { LineConsumingLog } from './line-consuming-log';
+export interface IOSPerformanceLogOptions {
     remoteDebugger: any;
-    maxEvents: number;
-    _started: boolean;
-    /**
-     * @override
-     */
-    override startCapture(): Promise<any>;
-    /**
-     * @override
-     */
-    override stopCapture(): Promise<any>;
-    /**
-     * @override
-     */
-    override _serializeEntry(value: any): any;
-    /**
-     * @override
-     */
-    override _deserializeEntry(value: any): any;
-    /**
-     *
-     * @param {import('../commands/types').LogEntry} event
-     */
-    onTimelineEvent(event: import("../commands/types").LogEntry): void;
+    maxEvents?: number;
+    log: AppiumLogger;
+}
+export declare class IOSPerformanceLog extends LineConsumingLog {
+    private readonly remoteDebugger;
+    private _started;
+    constructor(opts: IOSPerformanceLogOptions);
+    startCapture(): Promise<void>;
+    stopCapture(): Promise<void>;
+    get isCapturing(): boolean;
+    private onTimelineEvent;
 }
 export default IOSPerformanceLog;
-import { IOSLog } from './ios-log';
 //# 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":"AAOA;IACE,qDAKC;IAHC,oBAAoC;IACpC,kBAAgD;IAChD,kBAAqB;IAGvB;;OAEG;IACH,sCAMC;IAED;;OAEG;IACH,qCAKC;IASD;;OAEG;IACH,0CAEC;IAED;;OAEG;IACH,4CAEC;IAED;;;OAGG;IACH,uBAFW,OAAO,mBAAmB,EAAE,QAAQ,QAK9C;CACF;;uBA/DsB,WAAW"}
+{"version":3,"file":"ios-performance-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/ios-performance-log.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IACrC,OAAO,CAAC,QAAQ,CAAU;gBAEd,IAAI,EAAE,wBAAwB;IAS3B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3C,IAAa,WAAW,IAAI,OAAO,CAElC;IAED,OAAO,CAAC,eAAe;CAKxB;AAED,eAAe,iBAAiB,CAAC"}

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

@@ -4,62 +4,36 @@ 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 ios_log_1 = require("./ios-log");
-const log = support_1.logger.getLogger('IOSPerformanceLog');
-const MAX_EVENTS = 5000;
-class IOSPerformanceLog extends ios_log_1.IOSLog {
-    constructor(remoteDebugger, maxEvents = MAX_EVENTS) {
-        super(maxEvents);
-        this.remoteDebugger = remoteDebugger;
-        this.maxEvents = parseInt(String(maxEvents), 10);
+const helpers_1 = require("./helpers");
+const line_consuming_log_1 = require("./line-consuming-log");
+class IOSPerformanceLog extends line_consuming_log_1.LineConsumingLog {
+    constructor(opts) {
+        super({
+            maxBufferSize: opts.maxEvents ?? helpers_1.MAX_BUFFERED_EVENTS_COUNT,
+            log: opts.log,
+        });
+        this.remoteDebugger = opts.remoteDebugger;
         this._started = false;
     }
-    /**
-     * @override
-     */
     async startCapture() {
-        log.debug('Starting performance (Timeline) log capture');
+        this.log.debug('Starting performance (Timeline) log capture');
         this._clearEntries();
-        const result = await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
+        await this.remoteDebugger.startTimeline(this.onTimelineEvent.bind(this));
         this._started = true;
-        return result;
     }
-    /**
-     * @override
-     */
     async stopCapture() {
-        log.debug('Stopping performance (Timeline) log capture');
-        const result = await this.remoteDebugger.stopTimeline();
+        this.log.debug('Stopping performance (Timeline) log capture');
+        await this.remoteDebugger.stopTimeline();
         this._started = false;
-        return result;
     }
-    /**
-     * @override
-     */
     get isCapturing() {
         return this._started;
     }
-    /**
-     * @override
-     */
-    _serializeEntry(value) {
-        return value;
-    }
-    /**
-     * @override
-     */
-    _deserializeEntry(value) {
-        return value;
-    }
-    /**
-     *
-     * @param {import('../commands/types').LogEntry} event
-     */
     onTimelineEvent(event) {
-        log.debug(`Received Timeline event: ${lodash_1.default.truncate(JSON.stringify(event))}`);
-        this.broadcast(event);
+        const serializedEntry = JSON.stringify(event);
+        this.broadcast(serializedEntry);
+        this.log.debug(`Received Timeline event: ${lodash_1.default.truncate(serializedEntry, { length: helpers_1.MAX_JSON_LOG_LENGTH })}`);
     }
 }
 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;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"}
+{"version":3,"file":"ios-performance-log.js","sourceRoot":"","sources":["../../../lib/device-log/ios-performance-log.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,uCAA2E;AAC3E,6DAAwD;AASxD,MAAa,iBAAkB,SAAQ,qCAAgB;IAIrD,YAAY,IAA8B;QACxC,KAAK,CAAC;YACJ,aAAa,EAAE,IAAI,CAAC,SAAS,IAAI,mCAAyB;YAC1D,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,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAEQ,KAAK,CAAC,WAAW;QACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC9D,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEO,eAAe,CAAC,KAA0B;QAChD,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,gBAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAC,MAAM,EAAE,6BAAmB,EAAC,CAAC,EAAE,CAAC,CAAC;IAC3G,CAAC;CACF;AAnCD,8CAmCC;AAED,kBAAe,iBAAiB,CAAC"}

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 readonly sim;
+    private readonly showLogs;
+    private readonly 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,EAAE,YAAY,CAAC;CACnB;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,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;CAmBvC;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,26 +71,24 @@ 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) => {
-                for (const line of lines) {
-                    this.onOutput(line, ...(streamName === 'stderr' ? ['STDERR'] : []));
-                }
+            this.proc.on(`line-${streamName}`, (line) => {
+                this.onOutput(line, ...(streamName === 'stderr' ? ['STDERR'] : []));
             });
         }
-        const startDetector = (/** @type {string} */ stdout, /** @type {string} */ stderr) => {
+        const startDetector = (stdout, stderr) => {
             if (EXECVP_ERROR_PATTERN.test(stderr)) {
                 throw new Error('iOS log capture process failed to start');
             }
-            return stdout || stderr;
+            return Boolean(stdout || stderr);
         };
         await this.proc.start(startDetector, START_TIMEOUT);
     }

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/build/lib/device-log/safari-console-log.d.ts

@@ -1,8 +1,67 @@
-export default SafariConsoleLog;
-export class SafariConsoleLog extends RotatingLog {
-    constructor(showLogs: any);
-    addLogLine(err: any, out: any): void;
-    _previousOutput: any;
+import type { AppiumLogger } from '@appium/types';
+import IOSLog from './ios-log';
+import type { LogEntry } from '../commands/types';
+export interface SafariConsoleLogOptions {
+    showLogs: boolean;
+    log: AppiumLogger;
+}
+export interface SafariConsoleStacktraceEntry {
+    functionName: string;
+    url: string;
+    scriptId: number;
+    lineNumber: number;
+    columnNumber: number;
+}
+export interface SafariConsoleEntry {
+    source: string;
+    level: string;
+    text: string;
+    type: string;
+    line: number;
+    column: number;
+    url?: string;
+    repeatCount: number;
+    stackTrace: SafariConsoleStacktraceEntry[];
 }
-import { RotatingLog } from './rotating-log';
+type TSerializedEntry = [SafariConsoleEntry, number];
+export declare class SafariConsoleLog extends IOSLog<SafariConsoleEntry, TSerializedEntry> {
+    private readonly _showLogs;
+    constructor(opts: SafariConsoleLogOptions);
+    startCapture(): Promise<void>;
+    stopCapture(): Promise<void>;
+    get isCapturing(): boolean;
+    /**
+     *
+     * @param err
+     * @param entry The output will be like:
+     *   {
+     *     "source": "javascript",
+     *     "level":"error",
+     *     "text":"ReferenceError: Can't find variable: s_account",
+     *     "type":"log",
+     *     "line":2,
+     *     "column":21,
+     *     "url":"https://assets.adobedtm.com/b46e318d845250834eda10c5a20827c045a4d76f/scripts/satellite-57866f8b64746d53a8000104-staging.js",
+     *     "repeatCount":1,
+     *     "stackTrace":[{
+     *       "functionName":"global code",
+     *       "url":"https://assets.adobedtm.com/b46e318d845250834eda10c5a20827c045a4d76f/scripts/satellite-57866f8b64746d53a8000104-staging.js",
+     *       "scriptId":"6",
+     *       "lineNumber":2,
+     *       "columnNumber":21
+     *     }]
+     *  }
+     *
+     * we need, at least, `level` (in accordance with Java levels
+     * (https://docs.oracle.com/javase/7/docs/api/java/util/logging/Level.html)),
+     * `timestamp`, and `message` to satisfy the java client. In order to
+     * provide all the information to the client, `message` is the full
+     * object, stringified.
+     *
+     */
+    onConsoleLogEvent(err: object | null, entry: SafariConsoleEntry): void;
+    protected _serializeEntry(value: SafariConsoleEntry): TSerializedEntry;
+    protected _deserializeEntry(value: TSerializedEntry): LogEntry;
+}
+export default SafariConsoleLog;
 //# sourceMappingURL=safari-console-log.d.ts.map

package/build/lib/device-log/safari-console-log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safari-console-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/safari-console-log.js"],"names":[],"mappings":";AAIA;IACE,2BASC;IAED,qCA2EC;IAhBG,qBAA0B;CAiB/B;4BA5FgD,gBAAgB"}
+{"version":3,"file":"safari-console-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/safari-console-log.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAOlD,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,MAAM,WAAW,4BAA4B;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,4BAA4B,EAAE,CAAC;CAC5C;AAED,KAAK,gBAAgB,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAErD,qBAAa,gBAAiB,SAAQ,MAAM,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;IAChF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;gBAExB,IAAI,EAAE,uBAAuB;IAQ1B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAC7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAC3C,IAAa,WAAW,IAAI,OAAO,CAElC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;cAOnD,eAAe,CAAC,KAAK,EAAE,kBAAkB,GAAG,gBAAgB;cAI5D,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,QAAQ;CAIxE;AAMD,eAAe,gBAAgB,CAAC"}