chore: improve android & iOS build step

Author: siddarthkay

.gitignore

@@ -197,3 +197,11 @@ lefthook.yml
 
 ## metro server logs
 metro-server-logs.log
+
+## adb logs
+adb_shell_monkey.log
+adb_install.log
+
+## xcrun logs
+xcrun_install.log
+xcrun_launch.log

scripts/run-android.sh

@@ -1,37 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
-set -m # needed to access jobs
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-
-# We run Metro in background while calling adb.
-cleanupMetro() {
-    pkill -f run-metro.sh
-    rm -f metro-server-logs.log
-}
-
-# Using function gives a neater jobspec name.
-runMetro() {
-   nohup "${GIT_ROOT}/scripts/run-metro.sh" 2>&1 \
-        | tee metro-server-logs.log
-}
-
-waitForMetro() {
-    set +e # Allow grep command to fail in the loop.
-    TIMEOUT=5
-    echo "Waiting for Metro server..." >&2
-    while ! grep -q "Welcome to Metro" metro-server-logs.log; do
-      echo -n "." >&2
-      sleep 1
-      if ((TIMEOUT == 0)); then
-        echo -e "\nMetro server timed out, exiting" >&2
-        set -e # Restore errexit for rest of script.
-        return 1
-      fi
-      ((TIMEOUT--))
-    done
-    set -e # Restore errexit for rest of script.
-}
+ADB_INSTALL_LOG_FILE=adb_install.log
+ADB_SHELL_MONKEY_LOG_FILE=adb_shell_monkey.log
 
 # Generate android debug build.
 export ANDROID_ABI_INCLUDE=$("${GIT_ROOT}/scripts/adb_devices_abis.sh")
@@ -40,14 +12,17 @@ export BUILD_TYPE=debug
 "${GIT_ROOT}/scripts/build-android.sh"
 
 # Install the APK on running emulator or android device.
-adb install ./result/app-debug.apk
-
-trap cleanupMetro EXIT ERR INT QUIT
-runMetro &
-waitForMetro
+installAndLaunchApp() {
+  adb install ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1
+  adb shell monkey -p im.status.ethereum.debug 1 > "${ADB_SHELL_MONKEY_LOG_FILE}" 2>&1
+}
 
-# Start the installed app.
-adb shell monkey -p im.status.ethereum.debug 1
+showAdbLogs() {
+  cat "${ADB_INSTALL_LOG_FILE}" >&2;
+  cat "${ADB_SHELL_MONKEY_LOG_FILE}" >&2;
+}
 
-# bring metro job to foreground
-fg 'runMetro'
+trap showAdbLogs EXIT ERR INT QUIT
+installAndLaunchApp &
+exec "${GIT_ROOT}/scripts/run-metro.sh" 2>&1

scripts/run-ios.sh

@@ -3,34 +3,20 @@ set -euo pipefail
 set -m # needed to access jobs
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+XCRUN_INSTALL_LOG_FILE=xcrun_install.log
+XCRUN_LAUNCH_LOG_FILE=xcrun_launch.log
 
-# We run Metro in background while calling adb.
-cleanupMetro() {
-    pkill -f run-metro.sh
-    rm -f metro-server-logs.log
-}
+# Install on the simulator
+installAndLaunchApp() {
+  xcrun simctl install "$UUID" "$APP_PATH" > "${XCRUN_INSTALL_LOG_FILE}" 2>&1
+  "${GIT_ROOT}/scripts/wait-for-metro-port.sh"  2>&1
+  xcrun simctl launch "$UUID" im.status.ethereum.debug > "${XCRUN_LAUNCH_LOG_FILE}" 2>&1
 
-# Using function gives a neater jobspec name.
-runMetro() {
-   nohup "${GIT_ROOT}/scripts/run-metro.sh" 2>&1 \
-        | tee metro-server-logs.log
 }
 
-waitForMetro() {
-    set +e # Allow grep command to fail in the loop.
-    TIMEOUT=5
-    echo "Waiting for Metro server..." >&2
-    while ! grep -q "Welcome to Metro" metro-server-logs.log; do
-      echo -n "." >&2
-      sleep 1
-      if ((TIMEOUT == 0)); then
-        echo -e "\nMetro server timed out, exiting" >&2
-        set -e # Restore errexit for rest of script.
-        return 1
-      fi
-      ((TIMEOUT--))
-    done
-    set -e # Restore errexit for rest of script.
+showXcrunLogs() {
+  cat "${XCRUN_INSTALL_LOG_FILE}" >&2;
+  cat "${XCRUN_LAUNCH_LOG_FILE}" >&2;
 }
 
 # Check if the first argument is provided
@@ -65,15 +51,6 @@ xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme St
 
 APP_PATH="${BUILD_DIR}/Build/Products/Debug-iphonesimulator/StatusIm.app"
 
-# Install on the simulator
-xcrun simctl install "$UUID" "$APP_PATH"
-
-trap cleanupMetro EXIT ERR INT QUIT
-runMetro &
-waitForMetro
-
-# launch the app when metro is ready
-xcrun simctl launch "$UUID" im.status.ethereum.debug
-
-# bring metro job to foreground
-fg 'runMetro'
+trap showXcrunLogs EXIT ERR INT QUIT
+installAndLaunchApp &
+exec "${GIT_ROOT}/scripts/run-metro.sh" 2>&1

scripts/wait-for-metro-port.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+TIMEOUT=10 # Metro should not this long to start
+
+while [ "${TIMEOUT}" -gt 0 ]; do
+  if ! lsof -i:8081 &> /dev/null; then
+    echo "."
+    sleep 1
+    ((TIMEOUT--))
+  else
+    break
+  fi
+done