appium-xcuitest-driver 7.21.2 → 7.22.0

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

@@ -1,61 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_LOG_ENTRIES_COUNT = exports.RotatingLog = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const support_1 = require("appium/support");
-const MAX_LOG_ENTRIES_COUNT = 10000;
-exports.MAX_LOG_ENTRIES_COUNT = MAX_LOG_ENTRIES_COUNT;
-class RotatingLog {
-    constructor(showLogs = false, label = 'Log Label') {
-        this.log = support_1.logger.getLogger(label);
-        this.showLogs = showLogs;
-        this.logs = [];
-        this.logIdxSinceLastRequest = 0;
-        this.isCapturing = false;
-    }
-    // eslint-disable-next-line require-await
-    async startCapture() {
-        this.isCapturing = true;
-    }
-    // eslint-disable-next-line require-await
-    async stopCapture() {
-        this.isCapturing = false;
-    }
-    /**
-     * @privateRemarks Subclasses must implement this.
-     */
-    addLogLine() {
-        throw new Error('Not implemented');
-    }
-    // eslint-disable-next-line require-await
-    async getLogs() {
-        if (this.logs.length && this.logIdxSinceLastRequest < this.logs.length) {
-            let result = this.logs;
-            if (this.logIdxSinceLastRequest > 0) {
-                result = result.slice(this.logIdxSinceLastRequest);
-            }
-            this.logIdxSinceLastRequest = this.logs.length;
-            return result;
-        }
-        return [];
-    }
-    // eslint-disable-next-line require-await
-    async getAllLogs() {
-        return lodash_1.default.clone(this.logs);
-    }
-    get logs() {
-        if (!this._logs) {
-            this.logs = [];
-        }
-        return this._logs;
-    }
-    set logs(logs) {
-        this._logs = logs;
-    }
-}
-exports.RotatingLog = RotatingLog;
-exports.default = RotatingLog;
-//# sourceMappingURL=rotating-log.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"rotating-log.js","sourceRoot":"","sources":["../../../lib/device-log/rotating-log.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,4CAAsC;AAEtC,MAAM,qBAAqB,GAAG,KAAK,CAAC;AA4Df,sDAAqB;AA1D1C,MAAM,WAAW;IACf,YAAY,QAAQ,GAAG,KAAK,EAAE,KAAK,GAAG,WAAW;QAC/C,IAAI,CAAC,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,sBAAsB,GAAG,CAAC,CAAC;QAEhC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO;QACX,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,yCAAyC;IACzC,KAAK,CAAC,UAAU;QACd,OAAO,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI;QACN,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,CAAC,IAAI;QACX,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;CACF;AAEO,kCAAW;AACnB,kBAAe,WAAW,CAAC"}

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

@@ -1,65 +0,0 @@
-import _ from 'lodash';
-import {logger} from 'appium/support';
-
-const MAX_LOG_ENTRIES_COUNT = 10000;
-
-class RotatingLog {
-  constructor(showLogs = false, label = 'Log Label') {
-    this.log = logger.getLogger(label);
-
-    this.showLogs = showLogs;
-    this.logs = [];
-    this.logIdxSinceLastRequest = 0;
-
-    this.isCapturing = false;
-  }
-
-  // eslint-disable-next-line require-await
-  async startCapture() {
-    this.isCapturing = true;
-  }
-
-  // eslint-disable-next-line require-await
-  async stopCapture() {
-    this.isCapturing = false;
-  }
-
-  /**
-   * @privateRemarks Subclasses must implement this.
-   */
-  addLogLine() {
-    throw new Error('Not implemented');
-  }
-
-  // eslint-disable-next-line require-await
-  async getLogs() {
-    if (this.logs.length && this.logIdxSinceLastRequest < this.logs.length) {
-      let result = this.logs;
-      if (this.logIdxSinceLastRequest > 0) {
-        result = result.slice(this.logIdxSinceLastRequest);
-      }
-      this.logIdxSinceLastRequest = this.logs.length;
-      return result;
-    }
-    return [];
-  }
-
-  // eslint-disable-next-line require-await
-  async getAllLogs() {
-    return _.clone(this.logs);
-  }
-
-  get logs() {
-    if (!this._logs) {
-      this.logs = [];
-    }
-    return this._logs;
-  }
-
-  set logs(logs) {
-    this._logs = logs;
-  }
-}
-
-export {RotatingLog, MAX_LOG_ENTRIES_COUNT};
-export default RotatingLog;

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

@@ -1,96 +0,0 @@
-import {RotatingLog, MAX_LOG_ENTRIES_COUNT} from './rotating-log';
-import _ from 'lodash';
-import {util} from 'appium/support';
-
-class SafariConsoleLog extends 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);
-      },
-    });
-  }
-
-  addLogLine(err, out) {
-    if (this.isCapturing) {
-      this.logs = this.logs || [];
-      while (this.logs.length >= 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 (_.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 ${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}`);
-      }
-    }
-  }
-}
-
-export {SafariConsoleLog};
-export default SafariConsoleLog;

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

@@ -1,193 +0,0 @@
-import _ from 'lodash';
-import URL from 'url';
-import {util} from 'appium/support';
-import {RotatingLog, MAX_LOG_ENTRIES_COUNT} from './rotating-log';
-
-class SafariNetworkLog extends RotatingLog {
-  constructor(showLogs) {
-    super(showLogs, 'SafariNetwork');
-  }
-
-  getEntry(requestId) {
-    let outputEntry;
-    while (this.logs.length >= 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;
-  }
-
-  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) {
-      return;
-    }
-
-    if (method === 'Network.loadingFinished' || method === 'Network.loadingFailed') {
-      this.printLogLine(outputEntry);
-    }
-  }
-
-  getLogDetails(outputEntry) {
-    // extract the data
-    const record = outputEntry.logs.reduce(function getRecord(record, entry) {
-      record.requestId = entry.requestId;
-      if (entry.response) {
-        const url = URL.parse(entry.response.url);
-        // get the last part of the url, along with the query string, if possible
-        record.name =
-          `${_.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]'
-          ? ''
-          : `@${_.last((URL.parse(line.url).pathname || '').split('/'))}:${line.lineNumber}`;
-      this.log.debug(`    ${_.padEnd(_.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 (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),
-      });
-    });
-  }
-}
-
-export {SafariNetworkLog};
-export default SafariNetworkLog;