devicely 2.1.3 → 2.1.5

package/scripts/shell/create_production_scripts.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# This script adds QUIET mode to all shell scripts
+# In QUIET mode, only errors and final success/failure are shown
+
+add_quiet_mode() {
+    local script="$1"
+    echo "Processing: $script"
+    
+    # Backup original
+    cp "$script" "$script.bak"
+    
+    # Add QUIET mode at the beginning (after shebang)
+    sed -i '' '2i\
+# Production mode - minimal logging\
+QUIET_MODE="${DEVICELY_QUIET:-false}"\
+log_info() { [ "$QUIET_MODE" != "true" ] && echo "$@"; }\
+log_success() { echo "$@"; }  # Always show success\
+log_error() { echo "$@" >&2; }  # Always show errors
+' "$script"
+    
+    # Replace echo with log_info for non-critical messages
+    # Keep ✅ and ❌ messages visible (success/error)
+    sed -i '' 's/echo "\(.*[^✅❌].*\)"/log_info "\1"/g' "$script"
+    
+    echo "✓ Updated: $script"
+}
+
+# Process main scripts
+for script in connect_ios_usb_multi_final.sh android_device_control.sh ios_device_control.sh; do
+    if [ -f "$script" ]; then
+        add_quiet_mode "$script"
+    fi
+done
+
+echo ""
+echo "✅ Scripts updated with QUIET mode"
+echo "To enable: export DEVICELY_QUIET=true"

package/scripts/shell/devices.conf

@@ -0,0 +1,24 @@
+# Device Configuration (Auto-updated)
+# Format: device_name,udid,ip_address,platform,type
+# Platform: ios | android
+# Type: usb | wireless
+# 
+# 🔌 USB DEVICES: Automatically detected and saved here
+#    - No configuration needed for USB connection
+#    - Add IP address to enable wireless support later
+#
+# 📡 WIRELESS DEVICES: Manually add with IP address
+#    - Format: device_name,udid,ip_address,platform,wireless
+#    - iOS: Device must be paired in Xcode, WebDriverAgent running
+#    - Android: Enable wireless ADB first
+#
+# Example entries:
+# MyiPhone,00008130-001A45C83ED8402E,,ios,usb           (iOS USB - auto-detected)
+# MyiPad,00008140-002B24361E41901C,192.168.1.100,ios,wireless  (iOS Wireless)
+# Pixel8,1A2B3C4D5E6F,,android,usb                      (Android USB - auto-detected)
+# GalaxyS23,ABCD1234,192.168.1.150,android,wireless     (Android Wireless)
+
+iPhone17,00008150-001058D13478401C,,ios,usb
+Pixel Tablet,emulator-5554,,android,usb
+iPhone17,00008150-001058D13478401C,10.28.127.167,ios,wireless
+2109119DI,100.84.68.240:5555,100.84.68.240,android,wireless

package/scripts/shell/install_uiautomator2.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Install UIAutomator2 APKs on Android device
+
+DEVICE_ID=$1
+
+if [ -z "$DEVICE_ID" ]; then
+    echo "Usage: $0 <device_id>"
+    echo "Example: $0 100.87.246.132:5555"
+    exit 1
+fi
+
+echo "🔍 Looking for UIAutomator2 APKs..."
+
+# Find APKs
+APK_PATH="$HOME/.appium/node_modules/appium-uiautomator2-driver/node_modules/appium-uiautomator2-server/apks"
+
+if [ ! -d "$APK_PATH" ]; then
+    echo "❌ UIAutomator2 APKs not found!"
+    echo "Please run: appium driver install uiautomator2"
+    exit 1
+fi
+
+SERVER_APK=$(ls "$APK_PATH"/appium-uiautomator2-server-v*.apk 2>/dev/null | head -1)
+TEST_APK="$APK_PATH/appium-uiautomator2-server-debug-androidTest.apk"
+
+if [ -z "$SERVER_APK" ] || [ ! -f "$TEST_APK" ]; then
+    echo "❌ APK files not found!"
+    exit 1
+fi
+
+echo "✅ Found APKs:"
+echo "   Server: $SERVER_APK"
+echo "   Test:   $TEST_APK"
+echo ""
+
+# Check if device is connected
+adb -s "$DEVICE_ID" get-state >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "❌ Device $DEVICE_ID not connected!"
+    exit 1
+fi
+
+echo "📱 Device connected: $DEVICE_ID"
+echo ""
+echo "⚠️  IMPORTANT: On your device, you may see installation prompts."
+echo "   Please ALLOW the installation!"
+echo ""
+echo "📦 Installing UIAutomator2 Server..."
+
+# Try to install with -g flag to grant all permissions
+adb -s "$DEVICE_ID" install -r -g "$SERVER_APK"
+if [ $? -ne 0 ]; then
+    echo ""
+    echo "⚠️  Installation failed or was canceled."
+    echo ""
+    echo "Please make sure:"
+    echo "  1. USB debugging is enabled"
+    echo "  2. 'Install via USB' is enabled in Developer Options"
+    echo "  3. You allowed the installation prompt on the device"
+    echo ""
+    echo "On Xiaomi/MIUI devices:"
+    echo "  Settings → Additional Settings → Developer Options"
+    echo "  → Enable 'Install via USB' AND 'USB debugging (Security settings)'"
+    echo ""
+    read -p "Press Enter to retry..."
+    adb -s "$DEVICE_ID" install -r -g "$SERVER_APK"
+fi
+
+echo ""
+echo "📦 Installing UIAutomator2 Test APK..."
+
+adb -s "$DEVICE_ID" install -r -g "$TEST_APK"
+if [ $? -ne 0 ]; then
+    echo ""
+    echo "⚠️  Test APK installation failed."
+    read -p "Press Enter to retry..."
+    adb -s "$DEVICE_ID" install -r -g "$TEST_APK"
+fi
+
+echo ""
+echo "🎉 UIAutomator2 installation complete!"
+echo ""
+echo "Verifying installation..."
+adb -s "$DEVICE_ID" shell pm list packages | grep io.appium.uiautomator2
+
+if [ $? -eq 0 ]; then
+    echo "✅ UIAutomator2 is now installed!"
+    echo "You can now use the 'getLocators' command."
+else
+    echo "❌ Verification failed. Please try manual installation."
+fi
+

package/scripts/shell/ios_device_control.sh

@@ -0,0 +1,220 @@
+#!/bin/bash
+# iOS Device Control - Restart/Shutdown/Status
+# Supports both USB and Wireless devices
+
+WDA_PORT=8100
+
+show_usage() {
+    echo "Usage: $0 [restart|shutdown|status] [device_name|UDID]"
+    echo ""
+    echo "Commands:"
+    echo "  restart   - Restart the device"
+    echo "  shutdown  - Shutdown the device (USB only)"
+    echo "  status    - Show device status"
+    echo ""
+    echo "Examples:"
+    echo "  $0 restart iphone16p"
+    echo "  $0 status"
+    echo "  $0 shutdown 00008140-001C24361E41801C"
+    exit 1
+}
+
+COMMAND=$1
+DEVICE_ID=$2
+
+if [ -z "$COMMAND" ]; then
+    show_usage
+fi
+
+# Load devices.conf
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+DEVICES_CONF="$SCRIPT_DIR/devices.conf"
+
+# Find device info
+find_device() {
+    local search_term=$1
+    
+    # Check USB devices first
+    if command -v idevice_id >/dev/null 2>&1; then
+        USB_UDIDS=($(idevice_id -l 2>/dev/null))
+        for udid in "${USB_UDIDS[@]}"; do
+            if [[ "$udid" == "$search_term"* ]] || [ -z "$search_term" ]; then
+                echo "usb|$udid|local"
+                return 0
+            fi
+            # Get device name
+            DEV_NAME=$(ideviceinfo -u "$udid" -k DeviceName 2>/dev/null | tr -d '\n')
+            if [ "$DEV_NAME" == "$search_term" ]; then
+                echo "usb|$udid|local"
+                return 0
+            fi
+        done
+    fi
+    
+    # Check wireless devices from config
+    if [ -f "$DEVICES_CONF" ]; then
+        while IFS=',' read -r name udid ip || [ -n "$name" ]; do
+            # Skip comments and empty lines
+            [[ "$name" =~ ^#.*$ ]] && continue
+            [ -z "$name" ] && continue
+            
+            # Trim whitespace
+            name=$(echo "$name" | xargs)
+            udid=$(echo "$udid" | xargs)
+            ip=$(echo "$ip" | xargs)
+            
+            if [ "$name" == "$search_term" ] || [ "$udid" == "$search_term" ] || [ -z "$search_term" ]; then
+                echo "wireless|$udid|$ip"
+                return 0
+            fi
+        done < "$DEVICES_CONF"
+    fi
+    
+    echo "not_found||"
+    return 1
+}
+
+restart_device() {
+    local device_info=$(find_device "$DEVICE_ID")
+    IFS='|' read -r dev_type udid ip <<< "$device_info"
+    
+    if [ "$dev_type" == "not_found" ]; then
+        echo "❌ Device not found: $DEVICE_ID"
+        exit 1
+    fi
+    
+    echo "🔄 Restarting device: $DEVICE_ID"
+    
+    if [ "$dev_type" == "usb" ]; then
+        echo "→ Using USB restart methods..."
+        
+        # Try idevicediagnostics first
+        if command -v idevicediagnostics >/dev/null 2>&1; then
+            if idevicediagnostics -u "$udid" restart 2>/dev/null; then
+                echo "✅ Device restart initiated (idevicediagnostics)"
+                return 0
+            fi
+        fi
+        
+        # Try devicectl (Xcode)
+        if command -v xcrun >/dev/null 2>&1; then
+            DC_OUT=$(xcrun devicectl device reboot --device "$udid" 2>&1)
+            if echo "$DC_OUT" | grep -qi "restart\|reboot\|success" || [ $? -eq 0 ]; then
+                echo "✅ Device restart initiated (devicectl)"
+                return 0
+            fi
+        fi
+        
+        echo "❌ All restart methods failed"
+        return 1
+    else
+        # Wireless - use WDA
+        echo "→ Using WDA restart (wireless)..."
+        R=$(curl -s -X POST "http://${ip}:${WDA_PORT}/wda/device/restart" \
+            -H 'Content-Type: application/json' -d '{}' -m 10)
+        
+        if echo "$R" | grep -q '"value"'; then
+            echo "✅ Device restart initiated (WDA)"
+            return 0
+        else
+            echo "❌ WDA restart failed"
+            return 1
+        fi
+    fi
+}
+
+shutdown_device() {
+    local device_info=$(find_device "$DEVICE_ID")
+    IFS='|' read -r dev_type udid ip <<< "$device_info"
+    
+    if [ "$dev_type" == "not_found" ]; then
+        echo "❌ Device not found: $DEVICE_ID"
+        exit 1
+    fi
+    
+    if [ "$dev_type" != "usb" ]; then
+        echo "❌ Shutdown only supported for USB devices"
+        echo "   Use 'restart' command for wireless devices"
+        exit 1
+    fi
+    
+    echo "⚠️  Shutting down device: $DEVICE_ID"
+    echo "   This will power off the device completely"
+    
+    if command -v idevicediagnostics >/dev/null 2>&1; then
+        if idevicediagnostics -u "$udid" shutdown 2>/dev/null; then
+            echo "✅ Device shutdown initiated"
+            return 0
+        fi
+    fi
+    
+    echo "❌ Shutdown failed - libimobiledevice not available"
+    return 1
+}
+
+show_status() {
+    echo "📱 Device Status"
+    echo ""
+    
+    # USB Devices
+    if command -v idevice_id >/dev/null 2>&1; then
+        USB_UDIDS=($(idevice_id -l 2>/dev/null))
+        if [ ${#USB_UDIDS[@]} -gt 0 ]; then
+            echo "USB Devices:"
+            for udid in "${USB_UDIDS[@]}"; do
+                DEV_NAME=$(ideviceinfo -u "$udid" -k DeviceName 2>/dev/null)
+                DEV_VERSION=$(ideviceinfo -u "$udid" -k ProductVersion 2>/dev/null)
+                echo "  🔌 $DEV_NAME"
+                echo "     UDID: $udid"
+                echo "     iOS: $DEV_VERSION"
+                echo ""
+            done
+        else
+            echo "USB Devices: None"
+            echo ""
+        fi
+    else
+        echo "⚠️  libimobiledevice not installed (USB detection disabled)"
+        echo "   Install: brew install libimobiledevice"
+        echo ""
+    fi
+    
+    # Wireless Devices
+    if [ -f "$DEVICES_CONF" ]; then
+        echo "Wireless Devices (from config):"
+        while IFS=',' read -r name udid ip || [ -n "$name" ]; do
+            [[ "$name" =~ ^#.*$ ]] && continue
+            [ -z "$name" ] && continue
+            
+            name=$(echo "$name" | xargs)
+            ip=$(echo "$ip" | xargs)
+            
+            # Check connectivity
+            if curl -s --connect-timeout 2 "http://${ip}:${WDA_PORT}/status" | grep -q '"state"'; then
+                echo "  📡 $name ✅ Online"
+            else
+                echo "  📡 $name ⚠️  Offline"
+            fi
+            echo "     IP: $ip"
+            echo ""
+        done < "$DEVICES_CONF"
+    else
+        echo "No devices.conf found"
+    fi
+}
+
+case "$COMMAND" in
+    restart|reboot)
+        restart_device
+        ;;
+    shutdown|poweroff)
+        shutdown_device
+        ;;
+    status)
+        show_status
+        ;;
+    *)
+        echo "❌ Unknown command: $COMMAND"
+        show_usage
+        ;;
+esac

package/scripts/shell/organize_project.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+# Project Organization Script
+
+echo "📁 Organizing Devicely Project Structure..."
+echo ""
+
+# Create directory structure
+mkdir -p docs/fixes
+mkdir -p docs/guides
+mkdir -p scripts/utilities
+mkdir -p scripts/testing
+mkdir -p .archive
+
+# Move documentation files
+echo "📄 Organizing documentation..."
+mv *_FIX*.md docs/fixes/ 2>/dev/null
+mv *_FIXES.md docs/fixes/ 2>/dev/null
+mv AI_*.md docs/fixes/ 2>/dev/null
+mv IMPLEMENTATION*.md docs/fixes/ 2>/dev/null
+mv FINAL_*.md docs/fixes/ 2>/dev/null
+
+mv *_GUIDE*.md docs/guides/ 2>/dev/null
+mv TROUBLESHOOTING.md docs/guides/ 2>/dev/null
+mv HOW_TO_*.md docs/guides/ 2>/dev/null
+
+# Move test scripts
+echo "🧪 Organizing test scripts..."
+mv test_*.sh scripts/testing/ 2>/dev/null
+mv test_*.js scripts/testing/ 2>/dev/null
+mv validate-*.js scripts/testing/ 2>/dev/null
+
+# Move utility scripts
+echo "🔧 Organizing utility scripts..."
+mv clean_*.sh scripts/utilities/ 2>/dev/null
+mv clean_*.js scripts/utilities/ 2>/dev/null
+mv find_*.sh scripts/utilities/ 2>/dev/null
+mv diagnose_*.sh scripts/utilities/ 2>/dev/null
+mv verify_*.sh scripts/utilities/ 2>/dev/null
+
+# Move old/obsolete files to archive
+echo "📦 Archiving obsolete files..."
+mv connect_android_usb.sh .archive/ 2>/dev/null
+mv connect_ios_usb.sh .archive/ 2>/dev/null
+mv setup_android.sh .archive/ 2>/dev/null
+
+# Keep important files in root
+echo "✅ Keeping in root:"
+echo "   - README.md"
+echo "   - start.sh"
+echo "   - setup.sh"
+echo "   - devices.conf"
+echo "   - apps_presets.conf"
+echo "   - Core control scripts"
+
+echo ""
+echo "✅ Project organized!"
+echo ""
+echo "📊 New structure:"
+tree -L 2 -d . 2>/dev/null || ls -la