Mobile Script Changes

Author: rayanwahid25

README.md

@@ -34,12 +34,17 @@ You can either run the script directly from the web or clone the repository and
 
     **macOS / Linux**
     ```bash
-    bash mac.sh or ./mac.sh
+    bash mac/run.sh or ./mac/run.sh
     ```
-    Incase there are any permission related issues, please run: chmod +x ./mac.sh
+    If you encounter any permission issues, ensure the script is executable:
+
+    ```
+    chmod +x ./mac/run.sh
+    ```
+    
     **Windows**
     ```powershell
-    ./windows.ps1
+    ./win/run.ps1
     ```
 
 ### Remote Execution
@@ -49,7 +54,7 @@ You can either run the script directly from the web or clone the repository and
 To run the onboarding utility on macOS or Linux without cloning, execute the following command in your terminal:
 
 ```bash
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/http-heading/browserstack-now/main/mac_os.sh)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/http-heading/browserstack-now/main/mac/run.sh)"
 ```
 
 #### Windows
@@ -58,7 +63,7 @@ To run the onboarding utility on Windows without cloning, execute the following
 **Note:** You may need to set the execution policy to `RemoteSigned` or `Bypass` to run the script.
 
 ```powershell
-iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/http-heading/browserstack-now/main/windows.ps1'))
+iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/http-heading/browserstack-now/main/win/run.ps1'))
 ```
 
 ## Identifying and sharing the log files

mac/proxy-check.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env sh
+
+# URL to test
+TEST_URL="https://www.browserstack.com/automate/browsers.json"
+
+# Detect proxy from env (case insensitive)
+PROXY="${http_proxy:-${HTTP_PROXY:-${https_proxy:-${HTTPS_PROXY}}}}"
+
+# Reset output variables
+export PROXY_HOST=""
+export PROXY_PORT=""
+
+# Function: parse proxy url to host + port
+parse_proxy() {
+    p="$1"
+    # strip protocol e.g. http://, https://
+    p="${p#http://}"
+    p="${p#https://}"
+    # strip credentials if any user:pass@
+    p="${p#*[@]}"
+
+    # extract host and port
+    export PROXY_HOST="${p%%:*}"
+    export PROXY_PORT="${p##*:}"
+}
+
+base64_encoded_creds=$(printf "%s" $BROWSERSTACK_USERNAME:$BROWSERSTACK_ACCESS_KEY | base64 | tr -d '\n')
+
+
+# If no proxy configured, exit early
+if [ -z "$PROXY" ]; then
+    echo "No proxy found in environment. Clearing proxy host and port variables."
+    export PROXY_HOST=""
+    export PROXY_PORT=""
+    return 0 2>/dev/null || exit 0
+fi
+
+echo "Proxy detected: $PROXY"
+parse_proxy "$PROXY"
+
+echo "Testing reachability via proxy..."
+
+
+STATUS_CODE=$(curl -sS -o /dev/null -H "Authorization: Basic ${base64_encoded_creds}" -w "%{http_code}" --proxy "$PROXY" "$TEST_URL" 2>/dev/null)
+
+if [ "${STATUS_CODE#2}" != "$STATUS_CODE" ]; then
+    echo "✅ Reachable. HTTP $STATUS_CODE"
+    echo "Exporting PROXY_HOST=$PROXY_HOST"
+    echo "Exporting PROXY_PORT=$PROXY_PORT"
+    export PROXY_HOST
+    export PROXY_PORT
+else
+    echo "❌ Not reachable (HTTP $STATUS_CODE). Clearing variables."
+    export PROXY_HOST=""
+    export PROXY_PORT=""
+fi

mac.sh renamed to mac/run.sh

@@ -26,24 +26,25 @@ APP_URL=""
 APP_PLATFORM=""   # ios | android | all
 
 
+<<<<<<< HEAD:mac.sh
 # ===== Error Patterns =====
 WEB_SETUP_ERRORS=("Work in Progress")
 WEB_LOCAL_ERRORS=("Work in Progress")
 
 MOBILE_SETUP_ERRORS=("Work in Progress")
 MOBILE_LOCAL_ERRORS=("Work in Progress")
 
+=======
+>>>>>>> 67ca2f8a83425109951e581354969d419862d844:mac/run.sh
 # ===== Example Platform Templates (replace with your full lists if available) =====
 WEB_PLATFORM_TEMPLATES=(
   "Windows|10|Chrome"
   "Windows|10|Firefox"
   "Windows|11|Edge"
   "Windows|11|Chrome"
   "Windows|8|Chrome"
-  #"OS X|Monterey|Safari"
   "OS X|Monterey|Chrome"
   "OS X|Ventura|Chrome"
-  #"OS X|Big Sur|Safari"
   "OS X|Catalina|Firefox"
 )
 
@@ -192,7 +193,6 @@ APP_URL=""
 APP_PLATFORM=""   # ios | android | all
 
 
-
 # ===== Log files (runtime only; created on first write) =====
 # ===== Log files (per-run) =====
 LOG_DIR="$WORKSPACE_DIR/$PROJECT_FOLDER/logs"
@@ -879,7 +879,7 @@ setup_web_nodejs() {
     local_flag=true
   fi
 
-  Log local flag status
+  #log_msg_to local flag status
   if [ "$local_flag" = "true" ]; then
     log_msg_to "✅ BrowserStack Local is ENABLED for this run." "$PRE_RUN_LOG_FILE"
   else
@@ -892,7 +892,7 @@ setup_web_nodejs() {
   export BROWSERSTACK_LOCAL=$local_flag
 
   # === 8️⃣ Run Tests ===
-  log_msg_to "🚀 Running 'npm run test'" "$GLOBAL" "$WEB_LOG_FILE"
+  log_msg_to "🚀 Running 'npm run test'. This could take a few minutes. Follow the Automaton build here: https://automation.browserstack.com/" "$WEB_LOG_FILE"
   npm run test >> "$WEB_LOG_FILE" 2>&1 || true
 
   # === 9️⃣ Wrap Up ===
@@ -1079,13 +1079,13 @@ PYEOF
 
   # Log local flag status
   if [ "$local_flag" = "true" ]; then
-    log_msg_to "⚠️ BrowserStack Local is ENABLED for this run." "$PRE_RUN_LOG_FILE"
+    log_msg_to "⚠️ BrowserStack Local is ENABLED for this run."
   else
-    log_msg_to "⚠️ BrowserStack Local is DISABLED for this run." "$PRE_RUN_LOG_FILE"
+    log_msg_to "⚠️ BrowserStack Local is DISABLED for this run." 
   fi  
 
   # Run pytest with BrowserStack SDK from the chosen platform directory
-  log_msg_to "🚀 Running 'cd $run_dir && browserstack-sdk pytest -s bstack_sample.py'" "$PRE_RUN_LOG_FILE"
+  log_msg_to "🚀 Running 'cd $run_dir && browserstack-sdk pytest -s bstack_sample.py'"
   (
     cd "$run_dir" && browserstack-sdk pytest -s bstack_sample.py >> "$log_file" 2>&1 || true
   )
@@ -1325,5 +1325,12 @@ fetch_plan_details
 # Plan summary in pre-run log
 # log_msg_to "Plan summary: WEB_PLAN_FETCHED=$WEB_PLAN_FETCHED (team max=$TEAM_PARALLELS_MAX_ALLOWED_WEB), MOBILE_PLAN_FETCHED=$MOBILE_PLAN_FETCHED (team max=$TEAM_PARALLELS_MAX_ALLOWED_MOBILE)" "$GLOBAL"
 log_msg_to "Plan summary: WEB_PLAN_FETCHED=$WEB_PLAN_FETCHED (team max=$TEAM_PARALLELS_MAX_ALLOWED_WEB), MOBILE_PLAN_FETCHED=$MOBILE_PLAN_FETCHED (team max=$TEAM_PARALLELS_MAX_ALLOWED_MOBILE)" "$GLOBAL"
+<<<<<<< HEAD:mac.sh
+=======
+log_msg_to "Checking proxy in environment" "$GLOBAL"
+chmod +x proxy-check.sh
+./proxy-check.sh
+log_msg_to "Starting setup run..." "$GLOBAL"
+>>>>>>> 67ca2f8a83425109951e581354969d419862d844:mac/run.sh
 run_setup
 log_msg_to "Setup run finished." "$GLOBAL"