appium-xcuitest-driver 10.16.0 → 10.16.2

package/lib/commands/certificate.ts

@@ -119,26 +119,14 @@ export async function mobileInstallCertificate(
       );
     }
   } else {
-    if (!this.opts.udid) {
-      throw new Error('udid capability is required');
-    }
-
-    let client: CertificateClient | null = null;
     try {
-      client = await CertificateClient.create(
-        this.opts.udid,
-        this.log,
-        isIos18OrNewer(this.opts)
-      );
-      await client.installCertificate({payload: Buffer.from(content, 'base64')});
+      await withCertificateClient(this, async (client) => {
+        await client.installCertificate({payload: Buffer.from(content, 'base64')});
+      });
       return;
     } catch (err) {
       this.log.error(`Failed to install the certificate: ${err.message}`);
       this.log.info('Falling back to the (slow) UI-based installation');
-    } finally {
-      if (client) {
-        await client.close();
-      }
     }
   }
 
@@ -166,7 +154,7 @@ export async function mobileInstallCertificate(
     try {
       const host = os.hostname();
       const certUrl = `http://${host}:${tmpPort}/${configName}`;
-      await tmpServer.listen(tmpPort);
+      tmpServer.listen(tmpPort);
       try {
         await waitForCondition(
           async () => {
@@ -238,7 +226,7 @@ export async function mobileInstallCertificate(
 
     return (await util.toInMemoryBase64(configPath)).toString();
   } finally {
-    await tmpServer.close();
+    tmpServer.close();
     await fs.rimraf(tmpRoot);
   }
 }
@@ -258,23 +246,7 @@ export async function mobileInstallCertificate(
  */
 export async function mobileRemoveCertificate(this: XCUITestDriver, name: string): Promise<string> {
   requireRealDevice(this, 'Removing certificate');
-  if (!this.opts.udid) {
-    throw new Error('udid capability is required');
-  }
-
-  let client: CertificateClient | null = null;
-  try {
-    client = await CertificateClient.create(
-      this.opts.udid,
-      this.log,
-      isIos18OrNewer(this.opts)
-    );
-    return await client.removeCertificate(name);
-  } finally {
-    if (client) {
-      await client.close();
-    }
-  }
+  return await withCertificateClient(this, async (client) => client.removeCertificate(name));
 }
 
 /**
@@ -288,18 +260,31 @@ export async function mobileRemoveCertificate(this: XCUITestDriver, name: string
  */
 export async function mobileListCertificates(this: XCUITestDriver): Promise<CertificateList> {
   requireRealDevice(this, 'Listing certificates');
-  if (!this.opts.udid) {
-    throw new Error('udid capability is required');
-  }
+  return await withCertificateClient(this, async (client) => client.listCertificates());
+}
 
+/**
+ * Helper function to create a CertificateClient, execute an operation, and ensure cleanup.
+ *
+ * @param driver - The XCUITestDriver instance
+ * @param operation - A callback function that receives the client and performs the operation
+ * @returns The result of the operation callback
+ */
+async function withCertificateClient<T>(
+  driver: XCUITestDriver,
+  operation: (client: CertificateClient) => Promise<T>,
+): Promise<T> {
   let client: CertificateClient | null = null;
   try {
+    if (!driver.opts.udid) {
+      throw new Error('udid capability is required');
+    }
     client = await CertificateClient.create(
-      this.opts.udid,
-      this.log,
-      isIos18OrNewer(this.opts)
+      driver.opts.udid,
+      driver.log,
+      isIos18OrNewer(driver.opts),
     );
-    return await client.listCertificates();
+    return await operation(client);
   } finally {
     if (client) {
       await client.close();

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

@@ -264,6 +264,7 @@ export class RealDevice {
   readonly udid: string;
   private readonly _log: AppiumLogger;
   readonly devicectl: Devicectl;
+  private platformVersion: string | undefined;
 
   constructor(udid: string, logger?: AppiumLogger) {
     this.udid = udid;
@@ -293,18 +294,20 @@ export class RealDevice {
       timeoutMs = IO_TIMEOUT_MS,
     } = opts;
     const timer = new timing.Timer().start();
-    const afcService = await services.startAfcService(this.udid);
+    const platformVersion = await this.getPlatformVersion();
+    const useRemoteXPC = !!platformVersion && util.compareVersions(platformVersion, '>=', '18.0');
+    const afcClient = await AfcClient.createForDevice(this.udid, useRemoteXPC);
     try {
       let bundlePathOnPhone: string;
       if ((await fs.stat(appPath)).isFile()) {
         // https://github.com/doronz88/pymobiledevice3/blob/6ff5001f5776e03b610363254e82d7fbcad4ef5f/pymobiledevice3/services/installation_proxy.py#L75
         bundlePathOnPhone = `/${path.basename(appPath)}`;
-        await pushFile(afcService, appPath, bundlePathOnPhone, {
+        await pushFile(afcClient, appPath, bundlePathOnPhone, {
           timeoutMs,
         });
       } else {
         bundlePathOnPhone = `${INSTALLATION_STAGING_DIR}/${bundleId}`;
-        await pushFolder(afcService, appPath, bundlePathOnPhone, {
+        await pushFolder(afcClient, appPath, bundlePathOnPhone, {
           enableParallelPush: true,
           timeoutMs,
         });
@@ -325,7 +328,7 @@ export class RealDevice {
       errMessage += `. Original error: ${(err as Error).message}`;
       throw new Error(errMessage);
     } finally {
-      afcService.close();
+      await afcClient.close();
     }
     this.log.info(
       `The installation of '${bundleId}' succeeded after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`
@@ -513,7 +516,10 @@ export class RealDevice {
   }
 
   async getPlatformVersion(): Promise<string> {
-    return await utilities.getOSVersion(this.udid);
+    if (!this.platformVersion) {
+      this.platformVersion = await utilities.getOSVersion(this.udid) as string;
+    }
+    return this.platformVersion;
   }
 
   async reset(opts: {bundleId?: string; fullReset?: boolean}): Promise<void> {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "10.16.0",
+  "version": "10.16.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "10.16.0",
+      "version": "10.16.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/strongbox": "^1.0.0-rc.1",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "10.16.0",
+  "version": "10.16.2",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {