appium-xcuitest-driver 7.21.0 → 7.21.1

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

@@ -4,10 +4,11 @@ import {logger} from 'appium/support';
 import {exec} from 'teen_process';
 
 const log = logger.getLogger('IOSSimulatorLog');
+const EXECVP_ERROR_PATTERN = /execvp\(\)/;
 
 const START_TIMEOUT = 10000;
 
-class IOSSimulatorLog extends IOSLog {
+export class IOSSimulatorLog extends IOSLog {
   constructor({sim, showLogs, xcodeVersion, iosSimulatorLogsPredicate}) {
     super();
     this.sim = sim;
@@ -17,6 +18,9 @@ class IOSSimulatorLog extends IOSLog {
     this.proc = null;
   }
 
+  /**
+   * @override
+   */
   async startCapture() {
     if (_.isUndefined(this.sim.udid)) {
       throw new Error(`Log capture requires a sim udid`);
@@ -44,41 +48,9 @@ class IOSSimulatorLog extends IOSLog {
     }
   }
 
-  async finishStartingLogCapture() {
-    if (!this.proc) {
-      log.errorAndThrow('Could not capture simulator log');
-    }
-    let firstLine = true;
-    let logRow = '';
-    this.proc.on('output', (stdout, stderr) => {
-      if (stdout) {
-        if (firstLine) {
-          if (stdout.endsWith('\n')) {
-            // don't store the first line of the log because it came before the sim was launched
-            firstLine = false;
-          }
-        } else {
-          logRow += stdout;
-          if (stdout.endsWith('\n')) {
-            this.onOutput(logRow);
-            logRow = '';
-          }
-        }
-      }
-      if (stderr) {
-        this.onOutput(logRow, 'STDERR');
-      }
-    });
-
-    let sd = (stdout, stderr) => {
-      if (/execvp\(\)/.test(stderr)) {
-        throw new Error('iOS log capture process failed to start');
-      }
-      return stdout || stderr;
-    };
-    await this.proc.start(sd, START_TIMEOUT);
-  }
-
+  /**
+   * @override
+   */
   async stopCapture() {
     if (!this.proc) {
       return;
@@ -87,6 +59,25 @@ class IOSSimulatorLog extends IOSLog {
     this.proc = null;
   }
 
+  /**
+   * @override
+   */
+  get isCapturing() {
+    return 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}`);
+    }
+  }
+
   async killLogSubProcess() {
     if (!this.proc.isRunning) {
       return;
@@ -103,22 +94,27 @@ class IOSSimulatorLog extends IOSLog {
     }
   }
 
-  get isCapturing() {
-    return this.proc && this.proc.isRunning;
-  }
+  async finishStartingLogCapture() {
+    if (!this.proc) {
+      log.errorAndThrow('Could not capture simulator log');
+    }
 
-  onOutput(logRow, prefix = '') {
-    const logs = _.cloneDeep(logRow.split('\n'));
-    for (const logLine of logs) {
-      if (!logLine) continue; // eslint-disable-line curly
-      this.broadcast(logLine);
-      if (this.showLogs) {
-        const space = prefix.length > 0 ? ' ' : '';
-        log.info(`[IOS_SYSLOG_ROW${space}${prefix}] ${logLine}`);
-      }
+    for (const streamName of ['stdout', 'stderr']) {
+      this.proc.on(`lines-${streamName}`, (/** @type {string[]} */ lines) => {
+        for (const line of lines) {
+          this.onOutput(line, ...(streamName === 'stderr' ? ['STDERR'] : []));
+        }
+      });
     }
+
+    const startDetector = (/** @type {string} */ stdout, /** @type {string} */ stderr) => {
+      if (EXECVP_ERROR_PATTERN.test(stderr)) {
+        throw new Error('iOS log capture process failed to start');
+      }
+      return stdout || stderr;
+    };
+    await this.proc.start(startDetector, START_TIMEOUT);
   }
 }
 
-export {IOSSimulatorLog};
 export default IOSSimulatorLog;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "7.21.0",
+  "version": "7.21.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "7.21.0",
+      "version": "7.21.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.0.60",
+        "teen_process": "^2.1.10",
         "ws": "^8.13.0"
       },
       "devDependencies": {
@@ -75,17 +75,17 @@
       }
     },
     "node_modules/@appium/base-driver": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.11.0.tgz",
-      "integrity": "sha512-DU6HVQL9Ys6R55c1BeSBZ8eBmQ4QjRG2vNjSJNaj4IXSfx4e9XVlVm4RbTqMbE7Tc2zsoGfqqPQFP4sxJCGsCg==",
+      "version": "9.11.1",
+      "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.11.1.tgz",
+      "integrity": "sha512-gil/4mE/I9SusprGkCgePSkqnvLhv+D2CZ3xS2GkOPmCv07M0Gpsf9y9IuN9LmgyNUDalDtnXjErSn+LDjZd9g==",
       "dependencies": {
-        "@appium/support": "^5.1.0",
+        "@appium/support": "^5.1.1",
         "@appium/types": "^0.21.0",
         "@colors/colors": "1.6.0",
         "@types/async-lock": "1.4.2",
         "@types/bluebird": "3.5.42",
         "@types/express": "4.17.21",
-        "@types/lodash": "4.17.5",
+        "@types/lodash": "4.17.6",
         "@types/method-override": "0.0.35",
         "@types/serve-favicon": "2.5.7",
         "async-lock": "1.4.1",
@@ -96,7 +96,7 @@
         "express": "4.19.2",
         "http-status-codes": "2.3.0",
         "lodash": "4.17.21",
-        "lru-cache": "10.2.2",
+        "lru-cache": "10.3.0",
         "method-override": "3.0.0",
         "morgan": "1.10.0",
         "path-to-regexp": "7.0.0",
@@ -113,17 +113,12 @@
         "spdy": "4.0.2"
       }
     },
-    "node_modules/@appium/base-driver/node_modules/@types/lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw=="
-    },
     "node_modules/@appium/docutils": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-1.0.16.tgz",
-      "integrity": "sha512-EjBN/Y3HW4cugjJcGBu8KEnqYZVr99TqnioVF5yOUmN7b/1j/tsvcsaRP+7w8h/cVAVSk+v4oDcLp8sU6dHl6A==",
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/@appium/docutils/-/docutils-1.0.17.tgz",
+      "integrity": "sha512-SXJftkyY2YRvPouPFuYAUrv9Yw8tkKHUUoBFQrOH5yvMOxt4RIx6G9TktHcisZ8p0y66fa+pr8ic87jnDPlCvA==",
       "dependencies": {
-        "@appium/support": "^5.1.0",
+        "@appium/support": "^5.1.1",
         "@appium/tsconfig": "^0.3.3",
         "@sliphua/lilconfig-ts-loader": "3.2.2",
         "@types/which": "3.0.4",
@@ -152,6 +147,21 @@
         "npm": ">=8"
       }
     },
+    "node_modules/@appium/docutils/node_modules/teen_process": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.6.tgz",
+      "integrity": "sha512-VCbxLX0EMjnq3kYS+UJBlqAIJJeNfAxDExLLX0jvWa8KyRPbVLzc+CHFwigwR8fTWIdsVOXR2f7owrSq1xtYrw==",
+      "dependencies": {
+        "bluebird": "^3.7.2",
+        "lodash": "^4.17.21",
+        "shell-quote": "^1.8.1",
+        "source-map-support": "^0.x"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0",
+        "npm": ">=8"
+      }
+    },
     "node_modules/@appium/logger": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@appium/logger/-/logger-1.5.0.tgz",
@@ -194,9 +204,9 @@
       }
     },
     "node_modules/@appium/support": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@appium/support/-/support-5.1.0.tgz",
-      "integrity": "sha512-i3h5b811wSjshSPZzf+vRWvXMJ0cCnevpxcnNGYSu2HVxZtGRGx2wxkXiJnrojadQHCtA0wVwm0wHqudMb6kwA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@appium/support/-/support-5.1.1.tgz",
+      "integrity": "sha512-YwludQ+V5mgGYJQjkuDJ29X0LSJehBeC5IwvaZxKdv/VKLKAbOl3QZqv3RKIGJqQInP6ZOD+doG3OVP64Y/txQ==",
       "dependencies": {
         "@appium/logger": "^1.5.0",
         "@appium/tsconfig": "^0.3.3",
@@ -259,6 +269,21 @@
         "sharp": "0.33.4"
       }
     },
+    "node_modules/@appium/support/node_modules/teen_process": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.6.tgz",
+      "integrity": "sha512-VCbxLX0EMjnq3kYS+UJBlqAIJJeNfAxDExLLX0jvWa8KyRPbVLzc+CHFwigwR8fTWIdsVOXR2f7owrSq1xtYrw==",
+      "dependencies": {
+        "bluebird": "^3.7.2",
+        "lodash": "^4.17.21",
+        "shell-quote": "^1.8.1",
+        "source-map-support": "^0.x"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0",
+        "npm": ">=8"
+      }
+    },
     "node_modules/@appium/tsconfig": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-0.3.3.tgz",
@@ -2420,9 +2445,9 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
+      "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -3717,9 +3742,9 @@
       }
     },
     "node_modules/teen_process": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.6.tgz",
-      "integrity": "sha512-VCbxLX0EMjnq3kYS+UJBlqAIJJeNfAxDExLLX0jvWa8KyRPbVLzc+CHFwigwR8fTWIdsVOXR2f7owrSq1xtYrw==",
+      "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-2.1.10.tgz",
+      "integrity": "sha512-zEXJ+qOij5Kiov7X5rvWexo3yV9EJiVdjM53XTD0E7v8QxEOHoGBeIy4J/iKDD2sCO60sIaSIRS4Y50Tya5/PA==",
       "dependencies": {
         "bluebird": "^3.7.2",
         "lodash": "^4.17.21",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.21.0",
+  "version": "7.21.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.0.60",
+    "teen_process": "^2.1.10",
     "ws": "^8.13.0"
   },
   "scripts": {