appium-xcuitest-driver 10.17.0 → 10.18.0

package/lib/device/real-device-management.ts

@@ -7,8 +7,9 @@ import {buildSafariPreferences, SAFARI_BUNDLE_ID} from '../app-utils';
 import {log as defaultLogger} from '../logger';
 import { Devicectl } from 'node-devicectl';
 import type { AppiumLogger } from '@appium/types';
-import type { XCUITestDriver } from '../driver';
+import type { XCUITestDriver, XCUITestDriverOpts } from '../driver';
 import {AfcClient} from './afc-client';
+import {isIos18OrNewer} from '../utils';
 
 const DEFAULT_APP_INSTALLATION_TIMEOUT_MS = 8 * 60 * 1000;
 export const IO_TIMEOUT_MS = 4 * 60 * 1000;
@@ -264,10 +265,11 @@ export class RealDevice {
   readonly udid: string;
   private readonly _log: AppiumLogger;
   readonly devicectl: Devicectl;
-  private platformVersion: string | undefined;
+  readonly driverOpts: XCUITestDriverOpts;
 
-  constructor(udid: string, logger?: AppiumLogger) {
+  constructor(udid: string, driverOpts: XCUITestDriverOpts, logger?: AppiumLogger) {
     this.udid = udid;
+    this.driverOpts = driverOpts;
     this._log = logger ?? defaultLogger;
     this.devicectl = new Devicectl(this.udid);
   }
@@ -294,8 +296,7 @@ export class RealDevice {
       timeoutMs = IO_TIMEOUT_MS,
     } = opts;
     const timer = new timing.Timer().start();
-    const platformVersion = await this.getPlatformVersion();
-    const useRemoteXPC = !!platformVersion && util.compareVersions(platformVersion, '>=', '18.0');
+    const useRemoteXPC = isIos18OrNewer(this.driverOpts);
     const afcClient = await AfcClient.createForDevice(this.udid, useRemoteXPC);
     try {
       let bundlePathOnPhone: string;
@@ -516,10 +517,7 @@ export class RealDevice {
   }
 
   async getPlatformVersion(): Promise<string> {
-    if (!this.platformVersion) {
-      this.platformVersion = await utilities.getOSVersion(this.udid) as string;
-    }
-    return this.platformVersion;
+    return await utilities.getOSVersion(this.udid);
   }
 
   async reset(opts: {bundleId?: string; fullReset?: boolean}): Promise<void> {

package/lib/driver.ts

@@ -1362,7 +1362,7 @@ export class XCUITestDriver
       }
 
       this.log.debug(`Creating iDevice object with udid '${this.opts.udid}'`);
-      const device = new RealDevice(this.opts.udid as string, this.log);
+      const device = new RealDevice(this.opts.udid as string, this.opts, this.log);
       return {device, realDevice: true, udid: this.opts.udid as string};
     }
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "10.17.0",
+  "version": "10.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "10.17.0",
+      "version": "10.18.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/strongbox": "^1.0.0-rc.1",
@@ -15,7 +15,7 @@
         "appium-ios-device": "^3.0.0",
         "appium-ios-simulator": "^8.0.0",
         "appium-remote-debugger": "^15.2.0",
-        "appium-webdriveragent": "^11.1.0",
+        "appium-webdriveragent": "^11.1.1",
         "appium-xcode": "^6.0.2",
         "async-lock": "^1.4.0",
         "asyncbox": "^4.0.1",
@@ -122,6 +122,12 @@
         "node": ">=16"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/@appium/base-plugin": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@appium/base-plugin/-/base-plugin-3.0.5.tgz",
@@ -165,6 +171,12 @@
         "npm": ">=10"
       }
     },
+    "node_modules/@appium/docutils/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/@appium/docutils/node_modules/teen_process": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-3.0.4.tgz",
@@ -197,6 +209,12 @@
         "npm": ">=10"
       }
     },
+    "node_modules/@appium/logger/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/@appium/schema": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@appium/schema/-/schema-1.0.0.tgz",
@@ -275,6 +293,12 @@
         "sharp": "0.34.5"
       }
     },
+    "node_modules/@appium/support/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/@appium/support/node_modules/teen_process": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-3.0.4.tgz",
@@ -692,9 +716,9 @@
       }
     },
     "node_modules/appium-ios-remotexpc": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/appium-ios-remotexpc/-/appium-ios-remotexpc-0.26.0.tgz",
-      "integrity": "sha512-9c7z05u2vlwhn6OPyY60Tfug3U5LPNw1k6Se0qTRUxnGs7ttWltk+5Dn+QUy4XDRKCtogmv/azVWHBlfIz2xKg==",
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/appium-ios-remotexpc/-/appium-ios-remotexpc-0.26.1.tgz",
+      "integrity": "sha512-Bg548uTyRa2I0enFH5K5maD8vj97JBGdh61hE5dpfN1GRJC43LoQ0D07dD6N18tPtrS5LtC1uxYYrhG+iQj/XQ==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
@@ -752,16 +776,16 @@
       }
     },
     "node_modules/appium-remote-debugger": {
-      "version": "15.2.10",
-      "resolved": "https://registry.npmjs.org/appium-remote-debugger/-/appium-remote-debugger-15.2.10.tgz",
-      "integrity": "sha512-1Ez76NmzuiyF8tWMTgczgTidAF0HIV8PvWVjaxxjnQTuuwqAMpZ9bPv+iWwETAhPlC5vL/SSb7dU73HEki1vGw==",
+      "version": "15.2.13",
+      "resolved": "https://registry.npmjs.org/appium-remote-debugger/-/appium-remote-debugger-15.2.13.tgz",
+      "integrity": "sha512-tXFTHp+fUR13cjJH/O7gd1PPm+jsWAvfFQSJuSdoRzwF3EanP2l+EetCG0gyiSWHQ01T97iRHKlKeqYG8BeHPw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/base-driver": "^10.0.0-rc.1",
         "@appium/support": "^7.0.0-rc.1",
         "appium-ios-device": "^3.0.0",
         "async-lock": "^1.4.1",
-        "asyncbox": "^4.0.1",
+        "asyncbox": "^5.0.0",
         "bluebird": "^3.4.7",
         "glob": "^13.0.0",
         "lodash": "^4.17.11",
@@ -772,10 +796,24 @@
         "npm": ">=10"
       }
     },
+    "node_modules/appium-remote-debugger/node_modules/asyncbox": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/asyncbox/-/asyncbox-5.0.0.tgz",
+      "integrity": "sha512-F2D847Y1W4mJMBLvwN+1+l7dsS9uBq+Q9U3RqSih+zZ9d810/vMr0PXPF5OUGERtVVTXM6hVW80yFa3MXyIo7Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "lodash": "^4.17.4"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
+        "npm": ">=10"
+      }
+    },
     "node_modules/appium-webdriveragent": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-11.1.0.tgz",
-      "integrity": "sha512-Ve9n+QIM4JUwTvKKeuaVvyra1k02JAcNsmgTtbx3fNItEzuC/s4LjEvqoxdr5KAjGAIz/Np5Efqn6S1WyvEiZQ==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-11.1.1.tgz",
+      "integrity": "sha512-BWB1oFOzteMmlkeRUV9u3TDG187fnP3Vnr05RZcBjh5LI+qeKYRQHFl1VtU56V8Tjwujn4RlUhfwZQofMlxO3Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/base-driver": "^10.0.0-rc.1",
@@ -828,6 +866,12 @@
         "node": ">=16"
       }
     },
+    "node_modules/appium/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/appium/node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -2761,9 +2805,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "license": "MIT"
     },
     "node_modules/lodash.isfinite": {
@@ -4418,12 +4462,11 @@
       }
     },
     "node_modules/teen_process": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-4.0.7.tgz",
-      "integrity": "sha512-t7+1xY+WfihWM8M2JxL9ueH/SfDE7bhMuuVMR8bqrttQ0nn95hvOpGqThtZ2S/4+RvrJx2+UWO9no7wDFrOdsw==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/teen_process/-/teen_process-4.0.8.tgz",
+      "integrity": "sha512-0DTX2KfgVOr6+8TVmheEdiJHZ/bPOPeJuX0yvv5VOX3x+OFteNkmWkI+hX6zTkzxjddrktsrXkacfS2Gom1YyA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "bluebird": "^3.7.2",
         "lodash": "^4.17.21",
         "shell-quote": "^1.8.1"
       },

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "10.17.0",
+  "version": "10.18.0",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -83,7 +83,7 @@
     "appium-ios-device": "^3.0.0",
     "appium-ios-simulator": "^8.0.0",
     "appium-remote-debugger": "^15.2.0",
-    "appium-webdriveragent": "^11.1.0",
+    "appium-webdriveragent": "^11.1.1",
     "appium-xcode": "^6.0.2",
     "async-lock": "^1.4.0",
     "asyncbox": "^4.0.1",