⭐ feat: enhance device connection management (#262)

vangie · web-flow · commit d0b8ed599599 · 2025-11-06T14:53:49.000+08:00
- Added IsConnected field to DeviceDTO for connection status.
- Implemented ReconnectRegisteredDevices for server start reconnections.
- Updated device listing to show connection status.
- Refactored server and handler interfaces for new checks.
diff --git a/packages/cli/cmd/device_connect_list.go b/packages/cli/cmd/device_connect_list.go
@@ -12,6 +12,7 @@ import (
 )
 
 const (
+	statusConnected     = "Connected"
 	statusRegistered    = "Registered"
 	statusNotRegistered = "Not Registered"
 )
@@ -30,6 +31,7 @@ type DeviceDTO struct {
 	OS           string                 `json:"os"`         // android, linux, windows, macos
 	DeviceType   string                 `json:"deviceType"` // physical, emulator, vm
 	IsRegistered bool                   `json:"isRegistered"`
+	IsConnected  bool                   `json:"isConnected"` // true if device is currently connected to AP
 	RegId        string                 `json:"regId"`
 	IsLocal      bool                   `json:"isLocal"`  // true if this is the local desktop device
 	Metadata     map[string]interface{} `json:"metadata"` // Device-specific metadata
@@ -126,11 +128,18 @@ func outputDevicesTextFromAPI(devices []DeviceDTO) error {
 		serialNo := device.Serialno
 		transportID := device.TransportID
 		isRegistered := device.IsRegistered
-
-		status := statusNotRegistered
-		if isRegistered {
-			// Green for Registered
-			status = "\x1b[32m" + statusRegistered + "\x1b[0m"
+		isConnected := device.IsConnected
+
+		// Determine status based on connection state
+		var status string
+		if isConnected {
+			// Green for Connected
+			status = "\x1b[32m" + statusConnected + "\x1b[0m"
+		} else if isRegistered {
+			// Yellow for Registered but not connected
+			status = "\x1b[33m" + statusRegistered + "\x1b[0m"
+		} else {
+			status = statusNotRegistered
 		}
 
 		// Get OS and DeviceType from device
diff --git a/packages/cli/internal/server/device_keeper.go b/packages/cli/internal/server/device_keeper.go
@@ -113,6 +113,15 @@ func (dm *DeviceKeeper) Start() error {
 		}
 	}()
 
+	// Reconnect all registered devices (both Android and desktop)
+	go func() {
+		// Give adb watcher some time to detect online devices first
+		time.Sleep(2 * time.Second)
+		if err := dm.ReconnectRegisteredDevices(); err != nil {
+			log.Printf("Failed to reconnect registered devices: %v", err)
+		}
+	}()
+
 	return nil
 }
 
@@ -302,6 +311,12 @@ func (dm *DeviceKeeper) getDevice(serial string) (*DeviceSession, bool) {
 	return session, ok
 }
 
+// IsDeviceConnected checks if a device is currently connected to AP
+func (dm *DeviceKeeper) IsDeviceConnected(serial string) bool {
+	_, ok := dm.getDevice(serial)
+	return ok
+}
+
 func (dm *DeviceKeeper) hasDevice(serial string) bool {
 	dm.mu.RLock()
 	defer dm.mu.RUnlock()
@@ -402,6 +417,45 @@ func (dm *DeviceKeeper) CleanupExpiredDeviceInfos() {
 	}
 }
 
+// ReconnectRegisteredDevices reconnects all registered devices on server start
+// This is called after server startup to restore device connections
+func (dm *DeviceKeeper) ReconnectRegisteredDevices() error {
+	// Get all registered devices from cloud
+	deviceList, err := dm.deviceAPI.GetAll()
+	if err != nil {
+		return errors.Wrap(err, "failed to get registered devices from cloud")
+	}
+
+	log.Printf("Attempting to reconnect %d registered device(s)", len(deviceList.Data))
+
+	for _, dev := range deviceList.Data {
+		// Skip if device is already connected
+		if dm.IsDeviceConnected(dev.Metadata.Serialno) {
+			log.Printf("Device %s (%s) already connected, skipping", dev.Id, dev.Metadata.Serialno)
+			continue
+		}
+
+		deviceType := dev.Metadata.DeviceType
+		osType := dev.Metadata.OsType
+		serialno := dev.Metadata.Serialno
+
+		// For Android devices, wait for adb watcher to handle connection
+		// Only reconnect desktop devices here
+		if deviceType == "desktop" && serialno != "" {
+			log.Printf("Reconnecting desktop device %s (%s)", dev.Id, serialno)
+			go func(id, sn, dt, ot string) {
+				if err := dm.connectAPUsingDeviceId(sn, id, dt, ot); err != nil {
+					log.Printf("Failed to reconnect device %s: %v", id, err)
+				} else {
+					log.Printf("Successfully reconnected device %s", id)
+				}
+			}(dev.Id, serialno, deviceType, osType)
+		}
+	}
+
+	return nil
+}
+
 func connectAP(url, token, protocol, serial string) (*smux.Session, error) {
 	req, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
diff --git a/packages/cli/internal/server/handlers/devices.go b/packages/cli/internal/server/handlers/devices.go
@@ -35,6 +35,7 @@ type DeviceDTO struct {
 	OS           string                 `json:"os"`         // android, linux, windows, macos
 	DeviceType   string                 `json:"deviceType"` // physical, emulator, vm
 	IsRegistered bool                   `json:"isRegistered"`
+	IsConnected  bool                   `json:"isConnected"` // true if device is currently connected to AP
 	RegId        string                 `json:"regId"`
 	IsLocal      bool                   `json:"isLocal"`  // true if this is the local desktop device
 	Metadata     map[string]interface{} `json:"metadata"` // Device-specific metadata
@@ -187,6 +188,9 @@ func (h *DeviceHandlers) HandleDeviceList(w http.ResponseWriter, r *http.Request
 			}
 		}
 
+		// Check if device is currently connected to AP
+		dto.IsConnected = h.serverService.IsDeviceConnected(d.SerialNo)
+
 		// Update device info cache with complete device information
 		h.serverService.UpdateDeviceInfo(&dto)
 
@@ -296,6 +300,9 @@ func (h *DeviceHandlers) HandleDeviceList(w http.ResponseWriter, r *http.Request
 		}
 	}
 
+	// Check if desktop device is currently connected to AP
+	desktopDTO.IsConnected = h.serverService.IsDeviceConnected(desktopDTO.Serialno)
+
 	// Update device info cache with complete desktop device information
 	h.serverService.UpdateDeviceInfo(&desktopDTO)
 
@@ -1057,8 +1064,8 @@ func (h *DeviceHandlers) HandleDeviceControl(w http.ResponseWriter, req *http.Re
 // HandleDeviceExec executes a shell command on the server, scoped under a device path
 // Path: /api/devices/{serial}/exec
 // Method: POST
-// Body JSON: { "cmd": "echo hello", "timeout_sec": 60 }
-// Response JSON: { stdout, stderr, exit_code, duration_ms }
+// Body JSON: { "cmd": "echo hello", "timeoutSec": 60 }
+// Response JSON: { stdout, stderr, exitCode, durationMs }
 func (h *DeviceHandlers) HandleDeviceExec(w http.ResponseWriter, req *http.Request) {
 	// Extract device serial from path
 	path := strings.TrimPrefix(req.URL.Path, "/api/devices/")
@@ -1081,7 +1088,7 @@ func (h *DeviceHandlers) HandleDeviceExec(w http.ResponseWriter, req *http.Reque
 
 	var payload struct {
 		Cmd        string `json:"cmd"`
-		TimeoutSec int    `json:"timeout_sec"`
+		TimeoutSec int    `json:"timeoutSec"`
 	}
 	decoder := json.NewDecoder(req.Body)
 	if err := decoder.Decode(&payload); err != nil {
@@ -1137,11 +1144,11 @@ func (h *DeviceHandlers) HandleDeviceExec(w http.ResponseWriter, req *http.Reque
 	}
 
 	RespondJSON(w, http.StatusOK, map[string]interface{}{
-		"device":      deviceSerial,
-		"stdout":      stdoutBuf.String(),
-		"stderr":      stderrBuf.String(),
-		"exit_code":   exitCode,
-		"duration_ms": duration.Milliseconds(),
+		"device":     deviceSerial,
+		"stdout":     stdoutBuf.String(),
+		"stderr":     stderrBuf.String(),
+		"exitCode":   exitCode,
+		"durationMs": duration.Milliseconds(),
 	})
 }
 
@@ -1371,9 +1378,9 @@ func (h *DeviceHandlers) handleDeviceConnect(w http.ResponseWriter, r *http.Requ
 	}
 
 	RespondJSON(w, http.StatusOK, map[string]interface{}{
-		"success":   true,
-		"device_id": deviceID,
-		"status":    "connected",
+		"success":  true,
+		"deviceId": deviceID,
+		"status":   "connected",
 	})
 }
 
@@ -1389,9 +1396,9 @@ func (h *DeviceHandlers) handleDeviceDisconnect(w http.ResponseWriter, r *http.R
 	}
 
 	RespondJSON(w, http.StatusOK, map[string]interface{}{
-		"success":   true,
-		"device_id": deviceID,
-		"status":    "disconnected",
+		"success":  true,
+		"deviceId": deviceID,
+		"status":   "disconnected",
 	})
 }
 
diff --git a/packages/cli/internal/server/handlers/interfaces.go b/packages/cli/internal/server/handlers/interfaces.go
@@ -25,8 +25,6 @@ type ServerService interface {
 
 	// Static file serving
 	GetStaticFS() fs.FS
-	FindLiveViewStaticPath() string
-	FindStaticPath() string
 
 	// Server lifecycle
 	Stop() error
@@ -41,6 +39,8 @@ type ServerService interface {
 	GetSerialByDeviceId(deviceId string) string // Gets device serialno by device ID (supports both Android and desktop)
 	GetDeviceInfo(serial string) interface{}    // Returns DeviceDTO or nil
 	UpdateDeviceInfo(device interface{})        // Accepts DeviceDTO
+	IsDeviceConnected(serial string) bool       // Checks if device is currently connected to AP
+	ReconnectRegisteredDevices() error          // Reconnects all registered devices on server start
 }
 
 // Bridge defines the interface for device bridge operations
diff --git a/packages/cli/internal/server/server.go b/packages/cli/internal/server/server.go
