appium-xcuitest-driver 7.21.2 → 7.22.1

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

@@ -12,13 +12,13 @@ export interface IOSSimulatorLogOptions {
   sim: Simulator;
   showLogs?: boolean;
   iosSimulatorLogsPredicate?: string;
-  log?: AppiumLogger;
+  log: AppiumLogger;
 }
 
 export class IOSSimulatorLog extends LineConsumingLog {
-  private sim: Simulator;
-  private showLogs: boolean;
-  private predicate?: string;
+  private readonly sim: Simulator;
+  private readonly showLogs: boolean;
+  private readonly predicate?: string;
   private proc: SubProcess | null;
 
   constructor(opts: IOSSimulatorLogOptions) {
@@ -93,24 +93,22 @@ export class IOSSimulatorLog extends LineConsumingLog {
     }
   }
 
-  private async finishStartingLogCapture() {
+  private async finishStartingLogCapture(): Promise<void> {
     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'] : []));
-        }
+      this.proc.on(`line-${streamName}`, (line: string) => {
+        this.onOutput(line, ...(streamName === 'stderr' ? ['STDERR'] : []));
       });
     }
 
-    const startDetector = (/** @type {string} */ stdout, /** @type {string} */ stderr) => {
+    const startDetector = (stdout: string, stderr: string) => {
       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/lib/device-log/safari-console-log.ts

@@ -0,0 +1,112 @@
+import _ from 'lodash';
+import type { AppiumLogger } from '@appium/types';
+import {
+  toLogEntry,
+  DEFAULT_LOG_LEVEL,
+  MAX_JSON_LOG_LENGTH,
+  MAX_BUFFERED_EVENTS_COUNT
+} from './helpers';
+import IOSLog from './ios-log';
+import type { LogEntry } from '../commands/types';
+
+const LOG_LEVELS_MAP = {
+  error: 'SEVERE',
+  warning: 'WARNING',
+  log: 'FINE',
+};
+
+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[];
+}
+
+type TSerializedEntry = [SafariConsoleEntry, number];
+
+export class SafariConsoleLog extends IOSLog<SafariConsoleEntry, TSerializedEntry> {
+  private readonly _showLogs: boolean;
+
+  constructor(opts: SafariConsoleLogOptions) {
+    super({
+      log: opts.log,
+      maxBufferSize: MAX_BUFFERED_EVENTS_COUNT,
+    });
+    this._showLogs = opts.showLogs;
+  }
+
+  override async startCapture(): Promise<void> {}
+  override async stopCapture(): Promise<void> {}
+  override get isCapturing(): boolean {
+    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: object | null, entry: SafariConsoleEntry): void {
+    this.broadcast(entry);
+    if (this._showLogs) {
+      this.log.info(`[SafariConsole] ${_.truncate(JSON.stringify(entry), {length: MAX_JSON_LOG_LENGTH})}`);
+    }
+  }
+
+  protected override _serializeEntry(value: SafariConsoleEntry): TSerializedEntry {
+    return [value, Date.now()];
+  }
+
+  protected override _deserializeEntry(value: TSerializedEntry): LogEntry {
+    const [entry, timestamp] = value;
+    return toLogEntry(JSON.stringify(entry), timestamp, mapLogLevel(entry.level));
+  }
+}
+
+function mapLogLevel(originalLevel: string): string {
+  return LOG_LEVELS_MAP[originalLevel] ?? DEFAULT_LOG_LEVEL;
+}
+
+export default SafariConsoleLog;

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

@@ -0,0 +1,80 @@
+import _ from 'lodash';
+import { LineConsumingLog } from './line-consuming-log';
+import { MAX_JSON_LOG_LENGTH, MAX_BUFFERED_EVENTS_COUNT } from './helpers';
+import type { AppiumLogger } from '@appium/types';
+
+const EVENTS_TO_LOG = [
+  'Network.loadingFinished',
+  'Network.loadingFailed',
+];
+const MONITORED_EVENTS = [
+  'Network.requestWillBeSent',
+  'Network.responseReceived',
+  ...EVENTS_TO_LOG,
+];
+
+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;
+  // Safari has a `metrics` object on it's `Network.loadingFinished` event
+  metrics?: SafariNetworkLogEntryMetrics;
+  errorText?: string;
+  // When a network call is cancelled, Safari returns `cancelled` as error text
+  // but has a boolean `canceled`.
+  canceled?: boolean;
+}
+
+export class SafariNetworkLog extends LineConsumingLog {
+  private readonly _showLogs: boolean;
+
+  constructor(opts: SafariConsoleLogOptions) {
+    super({
+      log: opts.log,
+      maxBufferSize: MAX_BUFFERED_EVENTS_COUNT,
+    });
+    this._showLogs = opts.showLogs;
+  }
+
+  override async startCapture(): Promise<void> {}
+  override async stopCapture(): Promise<void> {}
+  override get isCapturing(): boolean {
+    return true;
+  }
+
+  onNetworkEvent(method: string, entry: SafariNetworkLogEntry): void {
+    if (!MONITORED_EVENTS.includes(method)) {
+      return;
+    }
+
+    const serializedEntry = JSON.stringify(entry);
+    this.broadcast(serializedEntry);
+    if (this._showLogs && EVENTS_TO_LOG.includes(method)) {
+      this.log.info(`[SafariNetwork] ${_.truncate(serializedEntry, {length: MAX_JSON_LOG_LENGTH})}`);
+    }
+  }
+}
+
+export default SafariNetworkLog;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "7.21.2",
+  "version": "7.22.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "7.21.2",
+      "version": "7.22.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@colors/colors": "^1.6.0",
@@ -30,7 +30,7 @@
         "portscanner": "^2.2.0",
         "semver": "^7.5.4",
         "source-map-support": "^0.x",
-        "teen_process": "^2.1.10",
+        "teen_process": "^2.2.0",
         "ws": "^8.13.0"
       },
       "devDependencies": {
@@ -113,6 +113,17 @@
         "spdy": "4.0.2"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/type-fest": {
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.1.tgz",
+      "integrity": "sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@appium/docutils": {
       "version": "1.0.17",
       "resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-1.0.17.tgz",
@@ -162,6 +173,29 @@
         "npm": ">=8"
       }
     },
+    "node_modules/@appium/docutils/node_modules/type-fest": {
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.1.tgz",
+      "integrity": "sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@appium/docutils/node_modules/typescript": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/@appium/logger": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@appium/logger/-/logger-1.5.0.tgz",
@@ -284,6 +318,17 @@
         "npm": ">=8"
       }
     },
+    "node_modules/@appium/support/node_modules/type-fest": {
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.1.tgz",
+      "integrity": "sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@appium/tsconfig": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-0.3.3.tgz",
@@ -313,6 +358,17 @@
         "npm": ">=8"
       }
     },
+    "node_modules/@appium/types/node_modules/type-fest": {
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.1.tgz",
+      "integrity": "sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
@@ -923,9 +979,9 @@
       }
     },
     "node_modules/appium-webdriveragent": {
-      "version": "8.7.5",
-      "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.7.5.tgz",
-      "integrity": "sha512-SydTNYy7VSOC15ujkWbtx7boGH/IDTm97kI6ZmvHXgR49SA5Y4h39/snqwWAo7TGD825bvSPDYEb5ontzKmcTw==",
+      "version": "8.7.6",
+      "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.7.6.tgz",
+      "integrity": "sha512-TrpMaiDlrtHISpF3J1At/a0Bsd8stR4B0YYXYqe8pfmsG9F9n/c2X+o44vnm6+Kt7imcxo9fhpIbn76/jI3Tpg==",
       "dependencies": {
         "@appium/base-driver": "^9.0.0",
         "@appium/strongbox": "^0.x",
@@ -938,7 +994,7 @@
         "bluebird": "^3.5.5",
         "lodash": "^4.17.11",
         "source-map-support": "^0.x",
-        "teen_process": "^2.0.0"
+        "teen_process": "^2.2.0"
       },
       "engines": {
         "node": ">=14",
@@ -3742,9 +3798,9 @@
       }
     },
     "node_modules/teen_process": {
-      "version": "2.1.10",
-      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.10.tgz",
-      "integrity": "sha512-zEXJ+qOij5Kiov7X5rvWexo3yV9EJiVdjM53XTD0E7v8QxEOHoGBeIy4J/iKDD2sCO60sIaSIRS4Y50Tya5/PA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.2.0.tgz",
+      "integrity": "sha512-YYHdMnRGAMXrP+KmUH3/WBelsR+OZUfdqCZEXHfhN/2Bn2eTVP11NyB4FeMOjlmtZB/Y5CiZnRKQqu2lJzzlVw==",
       "dependencies": {
         "bluebird": "^3.7.2",
         "lodash": "^4.17.21",
@@ -3790,17 +3846,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
       "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
-    "node_modules/type-fest": {
-      "version": "4.20.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.20.1.tgz",
-      "integrity": "sha512-R6wDsVsoS9xYOpy8vgeBlqpdOyzJ12HNfQhC/aAKWM3YoCV9TtunJzh/QpkMgeDhkoynDcw5f1y+qF9yc/HHyg==",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -3814,9 +3859,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
-      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
+      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.21.2",
+  "version": "7.22.1",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -97,7 +97,7 @@
     "portscanner": "^2.2.0",
     "semver": "^7.5.4",
     "source-map-support": "^0.x",
-    "teen_process": "^2.1.10",
+    "teen_process": "^2.2.0",
     "ws": "^8.13.0"
   },
   "scripts": {

package/build/lib/device-log/rotating-log.d.ts

@@ -1,21 +0,0 @@
-export default RotatingLog;
-export class RotatingLog {
-    constructor(showLogs?: boolean, label?: string);
-    log: import("@appium/types").AppiumLogger;
-    showLogs: boolean;
-    set logs(logs: any);
-    get logs(): any;
-    logIdxSinceLastRequest: number;
-    isCapturing: boolean;
-    startCapture(): Promise<void>;
-    stopCapture(): Promise<void>;
-    /**
-     * @privateRemarks Subclasses must implement this.
-     */
-    addLogLine(): void;
-    getLogs(): Promise<any>;
-    getAllLogs(): Promise<any>;
-    _logs: any;
-}
-export const MAX_LOG_ENTRIES_COUNT: 10000;
-//# sourceMappingURL=rotating-log.d.ts.map

package/build/lib/device-log/rotating-log.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rotating-log.d.ts","sourceRoot":"","sources":["../../../lib/device-log/rotating-log.js"],"names":[],"mappings":";AAKA;IACE,gDAQC;IAPC,0CAAkC;IAElC,kBAAwB;IAiD1B,oBAEC;IATD,gBAKC;IA7CC,+BAA+B;IAE/B,qBAAwB;IAI1B,8BAEC;IAGD,6BAEC;IAED;;OAEG;IACH,mBAEC;IAGD,wBAUC;IAGD,2BAEC;IAUC,WAAiB;CAEpB;AA1DD,0CAAoC"}

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;