Merge branch 'master' into appium3

Author: KazuCocoa

CHANGELOG.md

@@ -1,3 +1,27 @@
+## [9.10.4](https://github.com/appium/appium-xcuitest-driver/compare/v9.10.3...v9.10.4) (2025-08-06)
+
+### Bug Fixes
+
+* Make sure session id is set before cleaning up socket handlers ([#2604](https://github.com/appium/appium-xcuitest-driver/issues/2604)) ([3c73836](https://github.com/appium/appium-xcuitest-driver/commit/3c738363c1c7bb6106d6b2584558a0891dd8a47c))
+
+## [9.10.3](https://github.com/appium/appium-xcuitest-driver/compare/v9.10.2...v9.10.3) (2025-08-04)
+
+### Miscellaneous Chores
+
+* bump appium-ios-device to 2.9.0 ([#2603](https://github.com/appium/appium-xcuitest-driver/issues/2603)) ([69a6ca9](https://github.com/appium/appium-xcuitest-driver/commit/69a6ca95391b9dce74d8130fd818705a20ac073e))
+
+## [9.10.2](https://github.com/appium/appium-xcuitest-driver/compare/v9.10.1...v9.10.2) (2025-08-03)
+
+### Miscellaneous Chores
+
+* leave wda version info or debugging ([#2602](https://github.com/appium/appium-xcuitest-driver/issues/2602)) ([b683532](https://github.com/appium/appium-xcuitest-driver/commit/b68353263eb7a8fb814a6dcbb8b532df3a40a799))
+
+## [9.10.1](https://github.com/appium/appium-xcuitest-driver/compare/v9.10.0...v9.10.1) (2025-07-26)
+
+### Miscellaneous Chores
+
+* make  appium-ios-remotexpc optional deps ([#2600](https://github.com/appium/appium-xcuitest-driver/issues/2600)) ([5d956cf](https://github.com/appium/appium-xcuitest-driver/commit/5d956cf1653e48d5f5dc699ae63a70c67c2499ed))
+
 ## [9.10.0](https://github.com/appium/appium-xcuitest-driver/compare/v9.9.6...v9.10.0) (2025-07-25)
 
 ### Features

lib/commands/battery.js

@@ -13,9 +13,9 @@ export default {
   async mobileGetBatteryInfo() {
     let batteryInfoFromShimService;
     if (isIos18OrNewer(this.opts) && this.isRealDevice()) {
-      const {Services} = await import('appium-ios-remotexpc');
       let remoteXPCConnection;
       try {
+        const {Services} = await import('appium-ios-remotexpc');
         let { diagnosticsService, remoteXPC } = await Services.startDiagnosticsService(this.device.udid);
         remoteXPCConnection = remoteXPC;
         batteryInfoFromShimService = await diagnosticsService.ioregistry({

lib/driver.js

@@ -946,6 +946,16 @@ export class XCUITestDriver extends BaseDriver {
           await markSystemFilesForCleanup(this.wda);
         }
 
+        // We don't restrict the version, but show what version of WDA is running on the device for debugging purposes.
+        if (this.cachedWdaStatus?.build) {
+          this.log.info(`WebDriverAgent version: '${this.cachedWdaStatus.build.version}'`);
+        } else {
+          this.log.warn(
+            `WebDriverAgent does not provide any version information. ` +
+              `This might indicate either a custom or an outdated build.`
+          );
+        }
+
         // we expect certain socket errors until this point, but now
         // mark things as fully working
         this.wda.fullyStarted = true;
@@ -972,8 +982,8 @@ export class XCUITestDriver extends BaseDriver {
     this.logEvent('resetComplete');
   }
 
-  async deleteSession() {
-    await removeAllSessionWebSocketHandlers(this.server, this.sessionId);
+  async deleteSession(sessionId) {
+    await removeAllSessionWebSocketHandlers.bind(this)();
 
     for (const recorder of _.compact([
       this._recentScreenRecorder,
@@ -1049,7 +1059,7 @@ export class XCUITestDriver extends BaseDriver {
 
     this.resetIos();
 
-    await super.deleteSession();
+    await super.deleteSession(sessionId);
   }
 
   async stop() {

lib/utils.js

@@ -404,18 +404,17 @@ async function encodeBase64OrUpload(localPath, remotePath = null, uploadOptions
  * Stops and removes all web socket handlers that are listening
  * in scope of the current session.
  *
- * @param {Object} server - The instance of NodeJs HTTP server,
- * which hosts Appium
- * @param {string|null} sessionId - The id of the current session
+ * @this {XCUITestDriver}
+ * @returns {Promise<void>}
  */
-async function removeAllSessionWebSocketHandlers(server, sessionId) {
-  if (!server || !_.isFunction(server.getWebSocketHandlers)) {
+export async function removeAllSessionWebSocketHandlers() {
+  if (!this.sessionId || !_.isFunction(this.server?.getWebSocketHandlers)) {
     return;
   }
 
-  const activeHandlers = await server.getWebSocketHandlers(sessionId);
+  const activeHandlers = await this.server.getWebSocketHandlers(this.sessionId);
   for (const pathname of _.keys(activeHandlers)) {
-    await server.removeWebSocketHandler(pathname);
+    await this.server.removeWebSocketHandler(pathname);
   }
 }
 
@@ -538,7 +537,6 @@ export {
   printUser,
   getPIDsListeningOnPort,
   encodeBase64OrUpload,
-  removeAllSessionWebSocketHandlers,
   isLocalHost,
   normalizePlatformVersion,
   clearLogs,
@@ -548,4 +546,5 @@ export {
 /**
  * @typedef {import('appium-xcode').XcodeVersion} XcodeVersion
  * @typedef {import('appium-ios-simulator').Simulator} Simulator
+ * @typedef {import('./driver').XCUITestDriver} XCUITestDriver
  */

package.json

@@ -81,11 +81,10 @@
     "@appium/strongbox": "^0.x",
     "@colors/colors": "^1.6.0",
     "appium-idb": "^1.6.13",
-    "appium-ios-device": "^2.8.0",
+    "appium-ios-device": "^2.9.0",
     "appium-ios-simulator": "^6.2.2",
-    "appium-ios-remotexpc": "^0.x",
-    "appium-remote-debugger": "^13.1.0",
-    "appium-webdriveragent": "^9.11.0",
+    "appium-remote-debugger": "^13.1.1",
+    "appium-webdriveragent": "^9.15.2",
     "appium-xcode": "^5.1.4",
     "async-lock": "^1.4.0",
     "asyncbox": "^3.0.0",
@@ -104,6 +103,9 @@
     "winston": "3.17.0",
     "ws": "^8.13.0"
   },
+  "optionalDependencies": {
+    "appium-ios-remotexpc": "^0.x"
+  },
   "scripts": {
     "build": "tsc -b",
     "clean": "npm run build -- --clean",