devicely 2.1.6 → 2.1.7

package/scripts/shell/connect_android_usb_multi_final.sh

@@ -0,0 +1,289 @@
+#!/bin/bash
+# Android Multi-Device USB Control Script
+# Complete feature parity with iOS USB multi-device control
+
+SCRIPT_DIR="$(dirname "$0")"
+source "$SCRIPT_DIR/android_device_control.sh"
+
+# Check for config files in both local and npm package locations
+if [ -f "$SCRIPT_DIR/devices.conf" ]; then
+    CONFIG_FILE="$SCRIPT_DIR/devices.conf"
+elif [ -f "$SCRIPT_DIR/../../config/devices.conf" ]; then
+    CONFIG_FILE="$SCRIPT_DIR/../../config/devices.conf"
+else
+    echo "❌ Required file not found: devices.conf"
+    exit 1
+fi
+
+if [ -f "$SCRIPT_DIR/apps_presets.conf" ]; then
+    APPS_PRESETS_FILE="$SCRIPT_DIR/apps_presets.conf"
+elif [ -f "$SCRIPT_DIR/../../config/apps_presets.conf" ]; then
+    APPS_PRESETS_FILE="$SCRIPT_DIR/../../config/apps_presets.conf"
+else
+    echo "❌ Required file not found: apps_presets.conf"
+    exit 1
+fi
+
+# Port management (using files for bash 3.2 compatibility)
+UIAUTOMATOR2_PORT_BASE=6790
+DEVICE_PORTS_FILE="/tmp/android_usb_ports.$$"
+
+# Color codes
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+# Load Android devices from config
+load_android_devices() {
+    local devices=()
+    
+    if [ -f "$CONFIG_FILE" ]; then
+        while IFS=',' read -r name serial ip platform type; do
+            # Skip comments and empty lines
+            [[ "$name" =~ ^#.*$ ]] && continue
+            [ -z "$name" ] && continue
+            
+            # Only load Android devices
+            if [ "$platform" = "android" ]; then
+                devices+=("$name:$serial:$type")
+            fi
+        done < "$CONFIG_FILE"
+    fi
+    
+    echo "${devices[@]}"
+}
+
+# Detect connected Android devices via USB
+detect_usb_devices() {
+    echo -e "${BLUE}Detecting USB-connected Android devices...${NC}"
+    
+    local devices=()
+    while IFS=$'\t' read -r serial status; do
+        if [ "$status" = "device" ]; then
+            local model=$(adb -s "$serial" shell getprop ro.product.model | tr -d '\r' | tr ' ' '_')
+            devices+=("$model:$serial:usb")
+            echo -e "${GREEN}✓ Found: $model ($serial)${NC}"
+        fi
+    done < <(adb devices | tail -n +2)
+    
+    echo "${devices[@]}"
+}
+
+# Select target devices
+select_devices() {
+    local all_devices=($1)
+    local specified_device=$2
+    local selected=()
+    
+    if [ -n "$specified_device" ]; then
+        # Find specific device
+        for device in "${all_devices[@]}"; do
+            local name=$(echo "$device" | cut -d':' -f1)
+            local serial=$(echo "$device" | cut -d':' -f2)
+            
+            if [ "$name" = "$specified_device" ] || [ "$serial" = "$specified_device" ]; then
+                selected+=("$device")
+                break
+            fi
+        done
+        
+        if [ ${#selected[@]} -eq 0 ]; then
+            echo -e "${RED}Device not found: $specified_device${NC}" >&2
+            return 1
+        fi
+    else
+        # Use all devices
+        selected=("${all_devices[@]}")
+    fi
+    
+    echo "${selected[@]}"
+}
+
+# Execute command on device
+execute_on_device() {
+    local device_info=$1
+    local command=$2
+    
+    local name=$(echo "$device_info" | cut -d':' -f1)
+    local serial=$(echo "$device_info" | cut -d':' -f2)
+    local port=$((UIAUTOMATOR2_PORT_BASE))
+    
+    echo -e "\n${YELLOW}━━━ $name ($serial) ━━━${NC}"
+    
+    # Parse command
+    local cmd_parts=($command)
+    local main_cmd="${cmd_parts[0]}"
+    local cmd_args="${command#* }"
+    
+    # Handle app presets
+    if [ "$main_cmd" = "launch" ] && [ -f "$APPS_PRESETS_FILE" ]; then
+        local app_name="${cmd_parts[1]}"
+        local preset=$(grep "^$app_name=" "$APPS_PRESETS_FILE" 2>/dev/null | cut -d'=' -f2)
+        if [ -n "$preset" ]; then
+            cmd_args="$preset"
+        fi
+    fi
+    
+    # Execute via android_device_control.sh
+    process_command "$serial" "$port" "$main_cmd" $cmd_args
+}
+
+# Execute command on multiple devices in parallel
+execute_parallel() {
+    local last_idx=$#
+    local command="${!last_idx}"
+    set -- "${@:1:$(($#-1))}"
+    
+    local pids=()
+    
+    for device in "${devices[@]}"; do
+        execute_on_device "$device" "$command" &
+        pids+=($!)
+    done
+    
+    # Wait for all to complete
+    for pid in "${pids[@]}"; do
+        wait $pid
+    done
+}
+
+# Interactive mode
+interactive_mode() {
+    local devices=("$@")
+    
+    echo -e "${BLUE}╔════════════════════════════════════════╗${NC}"
+    echo -e "${BLUE}║  Android Multi-Device Control (USB)   ║${NC}"
+    echo -e "${BLUE}╚════════════════════════════════════════╝${NC}"
+    echo ""
+    echo -e "${GREEN}Connected Devices:${NC}"
+    
+    for i in "${!devices[@]}"; do
+        local name=$(echo "${devices[$i]}" | cut -d':' -f1)
+        local serial=$(echo "${devices[$i]}" | cut -d':' -f2)
+        echo -e "  $((i+1)). $name ($serial)"
+    done
+    
+    echo ""
+    echo -e "${YELLOW}Commands:${NC}"
+    echo "  launch <package>     - Launch app"
+    echo "  click <text>         - Click element"
+    echo "  type <text>          - Type text"
+    echo "  swipe <direction>    - Swipe (up/down/left/right)"
+    echo "  screenshot           - Take screenshot"
+    echo "  home                 - Go to home screen"
+    echo "  back                 - Go back"
+    echo "  getLocators          - Get UI elements"
+    echo "  info                 - Device info"
+    echo "  listapps             - List installed apps"
+    echo "  quit                 - Exit"
+    echo ""
+    
+    while true; do
+        echo -ne "${BLUE}android>${NC} "
+        read -r input
+        
+        [ -z "$input" ] && continue
+        [ "$input" = "quit" ] && break
+        
+        execute_parallel "${devices[@]}" "$input"
+    done
+}
+
+# Show help
+show_help() {
+    cat << EOF
+Android Multi-Device USB Control
+
+Usage:
+  $0                                    # Interactive mode (all devices)
+  $0 "command"                          # Execute on all devices
+  $0 -d <device> "command"              # Execute on specific device
+
+Commands:
+  launch <package> [activity]           Launch app
+  close <package>                       Close app
+  click <text|x,y>                     Click element
+  type <text>                           Type text
+  swipe <up|down|left|right>           Swipe gesture
+  screenshot                            Take screenshot
+  getLocators                           Get UI elements
+  home                                  Press home button
+  back                                  Press back button
+  lock                                  Lock device
+  unlock                                Unlock device
+  info                                  Device information
+  listapps                              List installed apps
+
+Examples:
+  $0 "launch com.android.chrome"
+  $0 -d Pixel8 "click 'Search'"
+  $0 "screenshot"
+  $0 -d Galaxy "getLocators"
+
+Device Selection:
+  -d <name>     Target specific device by name
+  -d <serial>   Target specific device by serial number
+
+Configuration:
+  devices.conf          Device definitions
+  apps_presets.conf     App package shortcuts
+
+EOF
+}
+
+# Main
+main() {
+    # Parse arguments
+    local specified_device=""
+    local command=""
+    
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            -h|--help)
+                show_help
+                exit 0
+                ;;
+            -d)
+                specified_device="$2"
+                shift 2
+                ;;
+            *)
+                command="$1"
+                shift
+                break
+                ;;
+        esac
+    done
+    
+    # Detect devices
+    local detected_devices=$(detect_usb_devices)
+    
+    if [ -z "$detected_devices" ]; then
+        echo -e "${RED}No Android devices detected via USB${NC}"
+        echo "Please ensure:"
+        echo "  1. Device is connected via USB"
+        echo "  2. USB debugging is enabled"
+        echo "  3. Device is authorized (check device screen)"
+        exit 1
+    fi
+    
+    # Select target devices
+    local target_devices=$(select_devices "$detected_devices" "$specified_device")
+    
+    if [ -z "$target_devices" ]; then
+        exit 1
+    fi
+    
+    local devices_array=($target_devices)
+    
+    # Execute command or enter interactive mode
+    if [ -n "$command" ]; then
+        execute_parallel "${devices_array[@]}" "$command"
+    else
+        interactive_mode "${devices_array[@]}"
+    fi
+}
+
+main "$@"

package/scripts/shell/connect_android_wireless.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+# Simple Android Wireless Command Wrapper
+# Calls android_device_control.sh directly with wireless device handling
+
+SCRIPT_DIR="$(dirname "$0")"
+ANDROID_CONTROL="$SCRIPT_DIR/android_device_control.sh"
+
+# Parse arguments
+DEVICE_NAME=""
+COMMAND=""
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -d)
+            DEVICE_NAME="$2"
+            shift 2
+            ;;
+        *)
+            COMMAND="$*"
+            break
+            ;;
+    esac
+done
+
+# Find device serial (wireless devices show as IP:PORT)
+if [ -z "$DEVICE_NAME" ]; then
+    SERIAL=$(adb devices | tail -n +2 | grep ":5555" | head -1 | awk '{print $1}')
+    if [ -z "$SERIAL" ]; then
+        echo "Error: No wireless Android devices found"
+        exit 1
+    fi
+else
+    # Check if it's an IP address
+    if [[ "$DEVICE_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        SERIAL="$DEVICE_NAME:5555"
+    elif adb devices | grep -q "^$DEVICE_NAME"; then
+        SERIAL="$DEVICE_NAME"
+    else
+        # Try to find by model name in wireless devices
+        SERIAL=$(adb devices -l | grep ":5555" | grep "$DEVICE_NAME" | awk '{print $1}')
+        if [ -z "$SERIAL" ]; then
+            SERIAL=$(adb devices | tail -n +2 | grep ":5555" | head -1 | awk '{print $1}')
+        fi
+    fi
+fi
+
+if [ -z "$SERIAL" ]; then
+    echo "Error: Could not find wireless device: $DEVICE_NAME"
+    exit 1
+fi
+
+if [ -z "$COMMAND" ]; then
+    echo "Error: No command specified"
+    exit 1
+fi
+
+# Execute command directly
+exec "$ANDROID_CONTROL" "$SERIAL" $COMMAND