appium-xcuitest-driver 7.21.1 → 7.22.0

package/build/lib/device-log/safari-console-log.js

@@ -4,93 +4,73 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafariConsoleLog = void 0;
-const rotating_log_1 = require("./rotating-log");
 const lodash_1 = __importDefault(require("lodash"));
-const support_1 = require("appium/support");
-class SafariConsoleLog extends rotating_log_1.RotatingLog {
-    constructor(showLogs) {
-        super(showLogs, 'SafariConsole');
-        // js console has `warning` level, so map to `warn`
-        this.log = new Proxy(this.log, {
-            get(target, prop, receiver) {
-                return Reflect.get(target, prop === 'warning' ? 'warn' : prop, receiver);
-            },
+const helpers_1 = require("./helpers");
+const ios_log_1 = __importDefault(require("./ios-log"));
+const LOG_LEVELS_MAP = {
+    error: 'SEVERE',
+    warning: 'WARNING',
+    log: 'FINE',
+};
+class SafariConsoleLog extends ios_log_1.default {
+    constructor(opts) {
+        super({
+            log: opts.log,
+            maxBufferSize: helpers_1.MAX_BUFFERED_EVENTS_COUNT,
         });
+        this._showLogs = opts.showLogs;
     }
-    addLogLine(err, out) {
-        if (this.isCapturing) {
-            this.logs = this.logs || [];
-            while (this.logs.length >= rotating_log_1.MAX_LOG_ENTRIES_COUNT) {
-                this.logs.shift();
-                if (this.logIdxSinceLastRequest > 0) {
-                    this.logIdxSinceLastRequest--;
-                }
-            }
-            /*
-             * 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.
-             */
-            const entry = {
-                level: {
-                    error: 'SEVERE',
-                    warning: 'WARNING',
-                    log: 'FINE',
-                }[out.level] || 'INFO',
-                timestamp: Date.now(),
-                message: JSON.stringify(out),
-            };
-            this.logs.push(entry);
-        }
-        if (lodash_1.default.has(out, 'count')) {
-            // this is a notification of the previous message being repeated
-            // this should _never_ be the first message, so the previous one ought to
-            // be populated. If it is not, nothing will break, it will just look odd
-            // in the output below (no url or line numbers)
-            const count = out.count;
-            out = this._previousOutput || {};
-            out.text = `Previous message repeated ${support_1.util.pluralize('time', count, true)}`;
-        }
-        else {
-            // save the most recent output
-            this._previousOutput = out;
-        }
-        // format output like
-        //     SafariConsole [WARNING][http://appium.io 2:13] Log something to warn
-        if (this.showLogs) {
-            let level = 'debug';
-            if (out.level === 'warning' || out.level === 'error') {
-                level = out.level;
-            }
-            for (const line of out.text.split('\n')) {
-                // url is optional, so get formatting here
-                const url = out.url ? `${out.url} ` : '';
-                this.log[level](`[${level.toUpperCase()}][${url}${out.line}:${out.column}] ${line}`);
-            }
+    async startCapture() { }
+    async stopCapture() { }
+    get isCapturing() {
+        return true;
+    }
+    /**
+     *
+     * @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, entry) {
+        this.broadcast(entry);
+        if (this._showLogs) {
+            this.log.info(`[SafariConsole] ${lodash_1.default.truncate(JSON.stringify(entry), { length: helpers_1.MAX_JSON_LOG_LENGTH })}`);
         }
     }
+    _serializeEntry(value) {
+        return [value, Date.now()];
+    }
+    _deserializeEntry(value) {
+        const [entry, timestamp] = value;
+        return (0, helpers_1.toLogEntry)(JSON.stringify(entry), timestamp, mapLogLevel(entry.level));
+    }
 }
 exports.SafariConsoleLog = SafariConsoleLog;
+function mapLogLevel(originalLevel) {
+    return LOG_LEVELS_MAP[originalLevel] ?? helpers_1.DEFAULT_LOG_LEVEL;
+}
 exports.default = SafariConsoleLog;
 //# sourceMappingURL=safari-console-log.js.map

package/build/lib/device-log/safari-console-log.js.map

@@ -1 +1 @@
-{"version":3,"file":"safari-console-log.js","sourceRoot":"","sources":["../../../lib/device-log/safari-console-log.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"safari-console-log.js","sourceRoot":"","sources":["../../../lib/device-log/safari-console-log.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,uCAKmB;AACnB,wDAA+B;AAG/B,MAAM,cAAc,GAAG;IACrB,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,SAAS;IAClB,GAAG,EAAE,MAAM;CACZ,CAAC;AA6BF,MAAa,gBAAiB,SAAQ,iBAA4C;IAGhF,YAAY,IAA6B;QACvC,KAAK,CAAC;YACJ,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,aAAa,EAAE,mCAAyB;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEQ,KAAK,CAAC,YAAY,KAAmB,CAAC;IACtC,KAAK,CAAC,WAAW,KAAmB,CAAC;IAC9C,IAAa,WAAW;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,iBAAiB,CAAC,GAAkB,EAAE,KAAyB;QAC7D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAC,MAAM,EAAE,6BAAmB,EAAC,CAAC,EAAE,CAAC,CAAC;QACvG,CAAC;IACH,CAAC;IAEkB,eAAe,CAAC,KAAyB;QAC1D,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7B,CAAC;IAEkB,iBAAiB,CAAC,KAAuB;QAC1D,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC;QACjC,OAAO,IAAA,oBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAChF,CAAC;CACF;AA7DD,4CA6DC;AAED,SAAS,WAAW,CAAC,aAAqB;IACxC,OAAO,cAAc,CAAC,aAAa,CAAC,IAAI,2BAAiB,CAAC;AAC5D,CAAC;AAED,kBAAe,gBAAgB,CAAC"}

package/build/lib/device-log/safari-network-log.d.ts

@@ -1,10 +1,38 @@
+import { LineConsumingLog } from './line-consuming-log';
+import type { AppiumLogger } from '@appium/types';
+export interface SafariConsoleLogOptions {
+    showLogs: boolean;
+    log: AppiumLogger;
+}
+export interface SafariNetworkResponseTiming {
+    responseStart: number;
+    receiveHeadersEnd: number;
+}
+export interface SafariNetworkResponse {
+    url: string;
+    status: number;
+    timing: SafariNetworkResponseTiming;
+    source: string;
+}
+export interface SafariNetworkLogEntryMetrics {
+    responseBodyBytesReceived: number;
+}
+export interface SafariNetworkLogEntry {
+    requestId: string;
+    response?: SafariNetworkResponse;
+    type?: string;
+    initiator?: string;
+    metrics?: SafariNetworkLogEntryMetrics;
+    errorText?: string;
+    canceled?: boolean;
+}
+export declare class SafariNetworkLog extends LineConsumingLog {
+    private readonly _showLogs;
+    constructor(opts: SafariConsoleLogOptions);
+    startCapture(): Promise<void>;
+    stopCapture(): Promise<void>;
+    get isCapturing(): boolean;
+    onNetworkEvent(method: string, entry: SafariNetworkLogEntry): void;
+}
 export default SafariNetworkLog;
-export class SafariNetworkLog extends RotatingLog {
-    constructor(showLogs: any);
-    getEntry(requestId: any): any;
-    addLogLine(method: any, out: any): void;
-    getLogDetails(outputEntry: any): any;
-    printLogLine(outputEntry: any): void;
-}
-import { RotatingLog } from './rotating-log';
 //# sourceMappingURL=safari-network-log.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"safari-network-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/safari-network-log.js"],"names":[],"mappings":";AAKA;IACE,2BAEC;IAED,8BA6CC;IAED,wCAmCC;IAED,qCAsCC;IAED,qCAwCC;CAeF;4BA1LgD,gBAAgB"}
+{"version":3,"file":"safari-network-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/safari-network-log.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAYlD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,MAAM,WAAW,2BAA2B;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,2BAA2B,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,4BAA4B;IAC3C,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,EAAE,4BAA4B,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,gBAAiB,SAAQ,gBAAgB;IACpD,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,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,IAAI;CAWnE;AAED,eAAe,gBAAgB,CAAC"}

package/build/lib/device-log/safari-network-log.js

@@ -5,163 +5,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafariNetworkLog = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const url_1 = __importDefault(require("url"));
-const support_1 = require("appium/support");
-const rotating_log_1 = require("./rotating-log");
-class SafariNetworkLog extends rotating_log_1.RotatingLog {
-    constructor(showLogs) {
-        super(showLogs, 'SafariNetwork');
+const line_consuming_log_1 = require("./line-consuming-log");
+const helpers_1 = require("./helpers");
+const EVENTS_TO_LOG = [
+    'Network.loadingFinished',
+    'Network.loadingFailed',
+];
+const MONITORED_EVENTS = [
+    'Network.requestWillBeSent',
+    'Network.responseReceived',
+    ...EVENTS_TO_LOG,
+];
+class SafariNetworkLog extends line_consuming_log_1.LineConsumingLog {
+    constructor(opts) {
+        super({
+            log: opts.log,
+            maxBufferSize: helpers_1.MAX_BUFFERED_EVENTS_COUNT,
+        });
+        this._showLogs = opts.showLogs;
     }
-    getEntry(requestId) {
-        let outputEntry;
-        while (this.logs.length >= rotating_log_1.MAX_LOG_ENTRIES_COUNT) {
-            // pull the first entry, which is the oldest
-            const entry = this.logs.shift();
-            if (entry && entry.requestId === requestId) {
-                // we are adding to an existing entry, and it was almost removed
-                // add to the end of the list and try again
-                outputEntry = entry;
-                this.logs.push(outputEntry);
-                continue;
-            }
-            // we've removed an element, so the count is down one
-            if (this.logIdxSinceLastRequest > 0) {
-                this.logIdxSinceLastRequest--;
-            }
-        }
-        if (!outputEntry) {
-            // we do not yes have an entry to associate this bit of output with
-            // most likely the entry will be at the end of the list, so start there
-            for (let i = this.logs.length - 1; i >= 0; i--) {
-                if (this.logs[i].requestId === requestId) {
-                    // found it!
-                    outputEntry = this.logs[i];
-                    // this is now the most current entry, so remove it from the list
-                    // to be added to the end below
-                    this.logs.splice(i, 1);
-                    break;
-                }
-            }
-            // nothing has been found, so create a new entry
-            if (!outputEntry) {
-                outputEntry = {
-                    requestId,
-                    logs: [],
-                };
-            }
-            // finally, add the entry to the end of the list
-            this.logs.push(outputEntry);
-        }
-        return outputEntry;
+    async startCapture() { }
+    async stopCapture() { }
+    get isCapturing() {
+        return true;
     }
-    addLogLine(method, out) {
-        if (!this.isCapturing && !this.showLogs) {
-            // neither capturing nor displaying, so do nothing
-            return;
-        }
-        if (['Network.dataReceived'].includes(method)) {
-            // status update, no need to handle
-            return;
-        }
-        // events we care about:
-        //   Network.requestWillBeSent
-        //   Network.responseReceived
-        //   Network.loadingFinished
-        //   Network.loadingFailed
-        const outputEntry = this.getEntry(out.requestId);
-        if (this.isCapturing) {
-            // now add the output we just received to the logs for this particular entry
-            outputEntry.logs = outputEntry.logs || [];
-            outputEntry.logs.push(out);
-        }
-        // if we are not displaying the logs,
-        // or we are not finished getting events for this network call,
-        // we are done
-        if (!this.showLogs) {
+    onNetworkEvent(method, entry) {
+        if (!MONITORED_EVENTS.includes(method)) {
             return;
         }
-        if (method === 'Network.loadingFinished' || method === 'Network.loadingFailed') {
-            this.printLogLine(outputEntry);
+        const serializedEntry = JSON.stringify(entry);
+        this.broadcast(serializedEntry);
+        if (this._showLogs && EVENTS_TO_LOG.includes(method)) {
+            this.log.info(`[SafariNetwork] ${lodash_1.default.truncate(serializedEntry, { length: helpers_1.MAX_JSON_LOG_LENGTH })}`);
         }
     }
-    getLogDetails(outputEntry) {
-        // extract the data
-        const record = outputEntry.logs.reduce(function getRecord(record, entry) {
-            record.requestId = entry.requestId;
-            if (entry.response) {
-                const url = url_1.default.parse(entry.response.url);
-                // get the last part of the url, along with the query string, if possible
-                record.name =
-                    `${lodash_1.default.last(String(url.pathname).split('/'))}${url.search ? `?${url.search}` : ''}` ||
-                        url.host;
-                record.status = entry.response.status;
-                if (entry.response.timing) {
-                    record.time =
-                        entry.response.timing.receiveHeadersEnd || entry.response.timing.responseStart || 0;
-                }
-                record.source = entry.response.source;
-            }
-            if (entry.type) {
-                record.type = entry.type;
-            }
-            if (entry.initiator) {
-                record.initiator = entry.initiator;
-            }
-            if (entry.metrics) {
-                // Safari has a `metrics` object on it's `Network.loadingFinished` event
-                record.size = entry.metrics.responseBodyBytesReceived || 0;
-            }
-            if (entry.errorText) {
-                record.errorText = entry.errorText;
-                // When a network call is cancelled, Safari returns `cancelled` as error text
-                // but has a boolean `canceled`. Normalize the two spellings in favor of
-                // the text, which will also be displayed
-                record.cancelled = entry.canceled;
-            }
-            return record;
-        }, {});
-        return record;
-    }
-    printLogLine(outputEntry) {
-        const { requestId, name, status, type, initiator = {}, size = 0, time = 0, source, errorText, cancelled = false, } = this.getLogDetails(outputEntry);
-        // print out the record, formatted appropriately
-        this.log.debug(`Network event:`);
-        this.log.debug(`  Id: ${requestId}`);
-        this.log.debug(`  Name: ${name}`);
-        this.log.debug(`  Status: ${status}`);
-        this.log.debug(`  Type: ${type}`);
-        this.log.debug(`  Initiator: ${initiator.type}`);
-        for (const line of initiator.stackTrace || []) {
-            const functionName = line.functionName || '(anonymous)';
-            const url = !line.url || line.url === '[native code]'
-                ? ''
-                : `@${lodash_1.default.last((url_1.default.parse(line.url).pathname || '').split('/'))}:${line.lineNumber}`;
-            this.log.debug(`    ${lodash_1.default.padEnd(lodash_1.default.truncate(functionName, { length: 20 }), 21)} ${url}`);
-        }
-        // get `memory-cache` or `disk-cache`, etc., right
-        const sizeStr = source.includes('cache') ? ` (from ${source.replace('-', ' ')})` : `${size}B`;
-        this.log.debug(`  Size: ${sizeStr}`);
-        this.log.debug(`  Time: ${Math.round(time)}ms`);
-        if (errorText) {
-            this.log.debug(`  Error: ${errorText}`);
-        }
-        if (support_1.util.hasValue(cancelled)) {
-            this.log.debug(`  Cancelled: ${cancelled}`);
-        }
-    }
-    async getLogs() {
-        const logs = await super.getLogs();
-        // in order to satisfy certain clients, we need to have a basic structure
-        // to the results, with `level`, `timestamp`, and `message`, which is
-        // all the information stringified
-        return logs.map(function adjustEntry(entry) {
-            return Object.assign({}, entry, {
-                level: 'INFO',
-                timestamp: Date.now(),
-                message: JSON.stringify(entry),
-            });
-        });
-    }
 }
 exports.SafariNetworkLog = SafariNetworkLog;
 exports.default = SafariNetworkLog;

package/build/lib/device-log/safari-network-log.js.map

@@ -1 +1 @@
-{"version":3,"file":"safari-network-log.js","sourceRoot":"","sources":["../../../lib/device-log/safari-network-log.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"safari-network-log.js","sourceRoot":"","sources":["../../../lib/device-log/safari-network-log.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,6DAAwD;AACxD,uCAA2E;AAG3E,MAAM,aAAa,GAAG;IACpB,yBAAyB;IACzB,uBAAuB;CACxB,CAAC;AACF,MAAM,gBAAgB,GAAG;IACvB,2BAA2B;IAC3B,0BAA0B;IAC1B,GAAG,aAAa;CACjB,CAAC;AAoCF,MAAa,gBAAiB,SAAQ,qCAAgB;IAGpD,YAAY,IAA6B;QACvC,KAAK,CAAC;YACJ,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,aAAa,EAAE,mCAAyB;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEQ,KAAK,CAAC,YAAY,KAAmB,CAAC;IACtC,KAAK,CAAC,WAAW,KAAmB,CAAC;IAC9C,IAAa,WAAW;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,MAAc,EAAE,KAA4B;QACzD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,SAAS,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,gBAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAC,MAAM,EAAE,6BAAmB,EAAC,CAAC,EAAE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC;CACF;AA5BD,4CA4BC;AAED,kBAAe,gBAAgB,CAAC"}

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();
     }
 
@@ -566,12 +569,12 @@ const commands = {
     if (name && name !== NATIVE_WIN && this.logs) {
       if (this.logs.safariConsole) {
         await this.remote.startConsole(
-          this.logs.safariConsole.addLogLine.bind(this.logs.safariConsole),
+          this.logs.safariConsole.onConsoleLogEvent.bind(this.logs.safariConsole),
         );
       }
       if (this.logs.safariNetwork) {
         await this.remote.startNetwork(
-          this.logs.safariNetwork.addLogLine.bind(this.logs.safariNetwork),
+          this.logs.safariNetwork.onNetworkEvent.bind(this.logs.safariNetwork),
         );
       }
     }

package/lib/commands/log.js

@@ -60,6 +60,12 @@ const SUPPORTED_LOG_TYPES = {
   },
 };
 
+const LOG_NAMES_TO_CAPABILITY_NAMES_MAP = {
+  safariConsole: 'showSafariConsoleLog',
+  safariNetwork: 'showSafariNetworkLog',
+  enablePerformanceLogging: 'enablePerformanceLogging',
+};
+
 export default {
   supportedLogTypes: SUPPORTED_LOG_TYPES,
   /**
@@ -77,11 +83,18 @@ export default {
 
     // If logs captured successfully send response with data, else send error
     const logObject = logsContainer[logType];
-    const logs = logObject ? await logObject.getLogs() : null;
-    if (logs) {
-      return logs;
+    if (logObject) {
+      return await logObject.getLogs();
+    }
+    if (logType in LOG_NAMES_TO_CAPABILITY_NAMES_MAP) {
+      throw new Error(
+        `${logType} logs are not enabled. Make sure you've set a proper value ` +
+        `to the 'appium:${LOG_NAMES_TO_CAPABILITY_NAMES_MAP[logType]}' capability.`
+      );
     }
-    throw new Error(`No logs of type '${String(logType)}' found.`);
+    throw new Error(
+      `No logs of type '${logType}' found. Supported log types are: ${_.keys(SUPPORTED_LOG_TYPES)}.`
+    );
   },
 
   /**
@@ -98,22 +111,30 @@ export default {
         sim: this.device,
         udid: this.isRealDevice() ? this.opts.udid : undefined,
       });
-
-      if (this.isRealDevice()) {
-        this.logs.syslog = new IOSDeviceLog({
+      this.logs.syslog = this.isRealDevice()
+        ? new IOSDeviceLog({
           udid: this.opts.udid,
           showLogs: this.opts.showIOSLog,
-        });
-      } else {
-        this.logs.syslog = new IOSSimulatorLog({
-          sim: this.device,
+          log: this.log,
+        })
+        : new IOSSimulatorLog({
+          sim: /** @type {import('appium-ios-simulator').Simulator} */ (this.device),
           showLogs: this.opts.showIOSLog,
-          xcodeVersion: this.xcodeVersion,
           iosSimulatorLogsPredicate: this.opts.iosSimulatorLogsPredicate,
+          log: this.log,
+        });
+      if (_.isBoolean(this.opts.showSafariConsoleLog)) {
+        this.logs.safariConsole = new SafariConsoleLog({
+          showLogs: this.opts.showSafariConsoleLog,
+          log: this.log,
+        });
+      }
+      if (_.isBoolean(this.opts.showSafariNetworkLog)) {
+        this.logs.safariNetwork = new SafariNetworkLog({
+          showLogs: this.opts.showSafariNetworkLog,
+          log: this.log,
         });
       }
-      this.logs.safariConsole = new SafariConsoleLog(!!this.opts.showSafariConsoleLog);
-      this.logs.safariNetwork = new SafariNetworkLog(!!this.opts.showSafariNetworkLog);
     }
 
     let didStartSyslog = false;
@@ -129,8 +150,6 @@ export default {
         }
       })(),
       this.logs.crashlog.startCapture(),
-      this.logs.safariConsole.startCapture(),
-      this.logs.safariNetwork.startCapture(),
     ];
     await B.all(promises);
 

package/lib/device-log/helpers.ts

@@ -1,9 +1,13 @@
 import type { LogEntry } from '../commands/types';
 
-export function toLogEntry(message: string, timestamp: number): LogEntry {
+export const DEFAULT_LOG_LEVEL = 'ALL';
+export const MAX_JSON_LOG_LENGTH = 200;
+export const MAX_BUFFERED_EVENTS_COUNT = 5000;
+
+export function toLogEntry(message: string, timestamp: number, level: string = DEFAULT_LOG_LEVEL): LogEntry {
   return {
     timestamp,
-    level: 'ALL',
+    level,
     message,
   };
 }

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

@@ -105,15 +105,6 @@ class IOSCrashLog {
     return await this.filesToJSON(diff);
   }
 
-  /**
-   * @returns {Promise<import('../commands/types').LogEntry[]>}
-   */
-  async getAllLogs() {
-    let crashFiles = await this.getCrashes();
-    let logFiles = _.difference(crashFiles, this.prevLogs);
-    return await this.filesToJSON(logFiles);
-  }
-
   /**
    * @param {string[]} paths
    * @returns {Promise<import('../commands/types').LogEntry[]>}

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 readonly udid: string;
+  private readonly 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;