feat: Ditch bluebird and lodash

Author: mykola-mokhnach

Scripts/build-webdriveragent.mjs

@@ -20,6 +20,11 @@ const WDA_BUNDLE_TV_PATH = path.join(DERIVED_DATA_PATH, 'Build', 'Products', 'De
 const TARGETS = ['runner', 'tv_runner'];
 const SDKS = ['sim', 'tv_sim'];
 
+/**
+ * Build WebDriverAgent and pack the app bundle into a zip archive.
+ *
+ * @param {string} [xcodeVersion] Xcode version to include in archive name.
+ */
 async function buildWebDriverAgent (xcodeVersion) {
   const target = process.env.TARGET;
   const sdk = process.env.SDK;
@@ -77,10 +82,12 @@ async function buildWebDriverAgent (xcodeVersion) {
 }
 
 if (isMainModule) {
-  buildWebDriverAgent().catch((e) => {
+  try {
+    await buildWebDriverAgent();
+  } catch (e) {
     LOG.error(e);
     process.exit(1);
-  });
+  }
 }
 
 export default buildWebDriverAgent;

Scripts/fetch-prebuilt-wda.mjs

@@ -12,6 +12,9 @@ const isMainModule = process.argv[1] && path.resolve(process.argv[1]) === __file
 
 const log = logger.getLogger('WDA');
 
+/**
+ * Download all prebuilt WebDriverAgent archives for the current package version.
+ */
 async function fetchPrebuiltWebDriverAgentAssets () {
   const packageJson = JSON.parse(readFileSync(path.resolve(__dirname, '..', 'package.json'), 'utf8'));
   const tag = packageJson.version;
@@ -61,10 +64,12 @@ async function fetchPrebuiltWebDriverAgentAssets () {
 }
 
 if (isMainModule) {
-  fetchPrebuiltWebDriverAgentAssets().catch((e) => {
+  try {
+    await fetchPrebuiltWebDriverAgentAssets();
+  } catch (e) {
     log.error(e);
     process.exit(1);
-  });
+  }
 }
 
 export default fetchPrebuiltWebDriverAgentAssets;

lib/check-dependencies.ts

@@ -5,21 +5,9 @@ import {WDA_SCHEME, SDK_SIMULATOR, WDA_RUNNER_APP} from './constants';
 import {BOOTSTRAP_PATH} from './utils';
 import type {XcodeBuild} from './xcodebuild';
 
-async function buildWDASim(): Promise<void> {
-  const args = [
-    '-project',
-    path.join(BOOTSTRAP_PATH, 'WebDriverAgent.xcodeproj'),
-    '-scheme',
-    WDA_SCHEME,
-    '-sdk',
-    SDK_SIMULATOR,
-    'CODE_SIGN_IDENTITY=""',
-    'CODE_SIGNING_REQUIRED="NO"',
-    'GCC_TREAT_WARNINGS_AS_ERRORS=0',
-  ];
-  await exec('xcodebuild', args);
-}
-
+/**
+ * Ensure simulator WDA is built and return the resulting app bundle path.
+ */
 export async function bundleWDASim(xcodebuild: XcodeBuild): Promise<string> {
   const derivedDataPath = await xcodebuild.retrieveDerivedDataPath();
   if (!derivedDataPath) {
@@ -38,3 +26,18 @@ export async function bundleWDASim(xcodebuild: XcodeBuild): Promise<string> {
   await buildWDASim();
   return wdaBundlePath;
 }
+
+async function buildWDASim(): Promise<void> {
+  const args = [
+    '-project',
+    path.join(BOOTSTRAP_PATH, 'WebDriverAgent.xcodeproj'),
+    '-scheme',
+    WDA_SCHEME,
+    '-sdk',
+    SDK_SIMULATOR,
+    'CODE_SIGN_IDENTITY=""',
+    'CODE_SIGNING_REQUIRED="NO"',
+    'GCC_TREAT_WARNINGS_AS_ERRORS=0',
+  ];
+  await exec('xcodebuild', args);
+}

lib/utils.ts

@@ -46,6 +46,20 @@ const getModuleRoot = _.memoize(function getModuleRoot(): string {
 
 export const BOOTSTRAP_PATH = getModuleRoot();
 
+/**
+ * Arguments for setting xctestrun file
+ */
+export interface XctestrunFileArgs {
+  deviceInfo: DeviceInfo;
+  sdkVersion: string;
+  bootstrapPath: string;
+  wdaRemotePort: number | string;
+  wdaBindingIP?: string;
+}
+
+/**
+ * Find and terminate all processes matching the given pgrep pattern.
+ */
 export async function killAppUsingPattern(pgrepPattern: string): Promise<void> {
   const signals = [2, 15, 9];
   for (const signal of signals) {
@@ -66,13 +80,16 @@ export async function killAppUsingPattern(pgrepPattern: string): Promise<void> {
     try {
       await waitForCondition(
         async () => {
-          const pidCheckPromises = matchedPids.map((pid) =>
-            exec('kill', ['-0', pid])
+          const pidCheckPromises = matchedPids.map(async (pid) => {
+            try {
+              await exec('kill', ['-0', pid]);
               // the process is still alive
-              .then(() => false)
+              return false;
+            } catch {
               // the process is dead
-              .catch(() => true),
-          );
+              return true;
+            }
+          });
           return (await B.all(pidCheckPromises)).every((x) => x === true);
         },
         {
@@ -96,6 +113,9 @@ export function isTvOS(platformName: string): boolean {
   return _.toLower(platformName) === _.toLower(PLATFORM_NAME_TVOS);
 }
 
+/**
+ * Configure keychain access required for real-device code signing.
+ */
 export async function setRealDeviceSecurity(
   keychainPath: string,
   keychainPassword: string,
@@ -106,17 +126,6 @@ export async function setRealDeviceSecurity(
   await exec('security', ['set-keychain-settings', '-t', '3600', '-l', keychainPath]);
 }
 
-/**
- * Arguments for setting xctestrun file
- */
-export interface XctestrunFileArgs {
-  deviceInfo: DeviceInfo;
-  sdkVersion: string;
-  bootstrapPath: string;
-  wdaRemotePort: number | string;
-  wdaBindingIP?: string;
-}
-
 /**
  * Creates xctestrun file per device & platform version.
  * We expects to have WebDriverAgentRunner_iphoneos${sdkVersion|platformVersion}-arm64.xctestrun for real device