fix: iOS resigning script (#1655)

Author: SrinivasanTarget

src/CapabilityManager.ts

@@ -5,6 +5,7 @@ import { IDevice } from './interfaces/IDevice';
 import { prisma } from './prisma';
 import { DevicePlugin } from './plugin';
 import log from './logger';
+import { updatedAllocatedDevice } from './data-service/device-service';
 
 export enum DEVICE_FARM_CAPABILITIES {
   BUILD_NAME = 'build',
@@ -79,18 +80,7 @@ export async function androidCapabilities(
 
 export async function iOSCapabilities(
   caps: ISessionCapability,
-  freeDevice: {
-    webDriverAgentUrl?: any;
-    udid: any;
-    name: string;
-    realDevice: boolean;
-    sdk: string;
-    mjpegServerPort?: number;
-    wdaLocalPort?: number;
-    derivedDataPath?: string;
-    wdaBundleId?: string;
-    webDriverAgentHost?: string;
-  },
+  freeDevice: IDevice,
   options: { liveVideo: boolean },
 ) {
   if (!process.env.GO_IOS) {
@@ -134,6 +124,11 @@ export async function iOSCapabilities(
     deleteMatch.push('appium:mjpegServerPort');
   }
   deleteMatch.forEach((value) => deleteAlwaysMatch(caps, value));
+  await updatedAllocatedDevice(freeDevice, {
+    wdaLocalPort: freeDevice.wdaLocalPort,
+    mjpegServerPort: freeDevice.mjpegServerPort,
+    webDriverAgentUrl: freeDevice.webDriverAgentUrl,
+  });
 }
 
 export function getDeviceFarmCapabilities(caps: ISessionCapability) {

src/device-utils.ts

@@ -144,6 +144,9 @@ export async function allocateDeviceForSession(
     delete filterCopy.userBlocked;
 
     const possibleDevice = await getDevice(filterCopy);
+    if (possibleDevice && possibleDevice.busy == true && !possibleDevice?.session_id) {
+      await unblockDevice(possibleDevice.udid, possibleDevice.host);
+    }
 
     let failureReason = 'No device matching request.';
     if (possibleDevice?.busy || possibleDevice?.userBlocked) {

src/modules

@@ -18,6 +18,8 @@ import { select } from '@inquirer/prompts';
 
 const execAsync = util.promisify(exec);
 const WDA_BUILD_PATH = '/appium_wda_ios/Build/Products/Debug-iphoneos';
+let bundleIdName: { uuid: string; name: string }[] | null = null;
+let freeBundleID: { uuid: string; name: string } | null = null;
 
 async function getXcodeMajorVersion(): Promise<number> {
   const { stdout } = await execAsync('xcodebuild -version');
@@ -97,6 +99,23 @@ const getMobileProvisioningFile = async (mobileProvisioningFile?: string) => {
       })),
     });
 
+    const isFreeAccount = await select({
+      message: 'Is this a free or enterprise account provisioning profile?',
+      choices: [
+        { value: true, name: 'Free Account' },
+        { value: false, name: 'Enterprise Account' },
+      ],
+    });
+    if (isFreeAccount) {
+      bundleIdName = provisioningFiles.map((file) => {
+        return { uuid: file.UUID, name: `${file.Name.split(':')[1] || file.Name}` };
+      });
+    }
+    freeBundleID =
+      bundleIdName?.find((d: any) => {
+        return d.uuid === prompt;
+      }) || null;
+
     return path.join(await getProvisioningProfilePath(), `${prompt}.mobileprovision`);
   }
 };
@@ -220,10 +239,21 @@ async function zipPayloadDirectory(
         task: async (context, task) => {
           const wdaBuildPath = path.join(context.wdaProjectPath, WDA_BUILD_PATH);
           const ipaPath = `${wdaBuildPath}/wda-resign.ipa`;
-          const as = new Applesign({
-            mobileprovision: mobileProvisioningFile,
-            outfile: ipaPath,
-          });
+
+          let appleOptions: any;
+          if (freeBundleID) {
+            appleOptions = {
+              mobileprovision: mobileProvisioningFile,
+              outfile: ipaPath,
+              bundleId: freeBundleID.name.replace(/^\s+|\s+$/g, ''),
+            };
+          } else {
+            appleOptions = {
+              mobileprovision: mobileProvisioningFile,
+              outfile: ipaPath,
+            };
+          }
+          const as = new Applesign(appleOptions);
           await as.signIPA(path.join(wdaBuildPath, 'wda-resign.zip'));
           task.title = `Successfully signed WebDriverAgent file  ${ipaPath}`;
         },