fix: retry set mjpeg framerate on wda due to a bug in agent

gmegidish · gmegidish · commit 19db13f51218 · 2025-11-27T12:22:59.000+01:00
diff --git a/devices/wda/appium-settings.go b/devices/wda/appium-settings.go
@@ -3,17 +3,18 @@ package wda
 import "fmt"
 
 func (c *WdaClient) SetAppiumSettings(settings map[string]interface{}) error {
-	// create wda session
+	// get or create wda session
 	sessionId, err := c.GetOrCreateSession()
 	if err != nil {
-		return fmt.Errorf("failed to create wda session: %w", err)
+		return fmt.Errorf("failed to get or create wda session: %w", err)
 	}
 
 	// post settings to appium endpoint
 	endpoint := fmt.Sprintf("session/%s/appium/settings", sessionId)
 	_, err = c.PostEndpoint(endpoint, map[string]interface{}{
 		"settings": settings,
 	})
+
 	if err != nil {
 		return fmt.Errorf("failed to set appium settings: %w", err)
 	}
@@ -22,11 +23,20 @@ func (c *WdaClient) SetAppiumSettings(settings map[string]interface{}) error {
 }
 
 func (c *WdaClient) SetMjpegFramerate(framerate int) error {
-	err := c.SetAppiumSettings(map[string]interface{}{
-		"mjpegServerFramerate": framerate,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to set mjpeg framerate: %w", err)
+	var err error
+	maxRetries := 5
+
+	for i := 0; i < maxRetries; i++ {
+		err = c.SetAppiumSettings(map[string]interface{}{
+			"mjpegServerFramerate": framerate,
+		})
+
+		if err == nil {
+			return nil
+		}
+
+		fmt.Printf("attempt %d/%d failed to set mjpeg framerate: %v\n", i+1, maxRetries, err)
 	}
-	return nil
+
+	return fmt.Errorf("failed to set mjpeg framerate after %d attempts: %w", maxRetries, err)
 }
diff --git a/devices/wda/requests.go b/devices/wda/requests.go
@@ -12,6 +12,18 @@ import (
 	"github.com/mobile-next/mobilecli/utils"
 )
 
+type alwaysMatch struct {
+	PlatformName string `json:"platformName"`
+}
+
+type sessionCapabilities struct {
+	AlwaysMatch alwaysMatch `json:"alwaysMatch"`
+}
+
+type sessionRequest struct {
+	Capabilities sessionCapabilities `json:"capabilities"`
+}
+
 func (c *WdaClient) GetEndpoint(endpoint string) (map[string]interface{}, error) {
 	url := fmt.Sprintf("%s/%s", c.baseURL, endpoint)
 
@@ -27,6 +39,7 @@ func (c *WdaClient) GetEndpoint(endpoint string) (map[string]interface{}, error)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch endpoint %s: %w", endpoint, err)
 	}
+
 	defer func() { _ = resp.Body.Close() }()
 
 	// check HTTP status code
@@ -63,6 +76,7 @@ func (c *WdaClient) PostEndpoint(endpoint string, data interface{}) (map[string]
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
+
 	req.Header.Set("Content-Type", "application/json")
 
 	resp, err := c.httpClient.Do(req)
@@ -144,14 +158,15 @@ func (c *WdaClient) WaitForAgent() error {
 }
 
 func (c *WdaClient) CreateSession() (string, error) {
-	response, err := c.PostEndpoint("session", map[string]interface{}{
-		"capabilities": map[string]interface{}{
-			"alwaysMatch": map[string]interface{}{
-				"platformName": "iOS",
+	request := sessionRequest{
+		Capabilities: sessionCapabilities{
+			AlwaysMatch: alwaysMatch{
+				PlatformName: "iOS",
 			},
 		},
-	})
+	}
 
+	response, err := c.PostEndpoint("session", request)
 	if err != nil {
 		return "", fmt.Errorf("failed to create session: %w", err)
 	}
@@ -175,6 +190,7 @@ func (c *WdaClient) GetOrCreateSession() (string, error) {
 		if c.isSessionStillValid(c.sessionId) {
 			return c.sessionId, nil
 		}
+
 		// session is invalid, clear it and create a new one
 		utils.Verbose("cached session %s is invalid, creating new session", c.sessionId)
 		c.sessionId = ""
@@ -195,5 +211,10 @@ func (c *WdaClient) DeleteSession(sessionId string) error {
 	if err != nil {
 		return fmt.Errorf("failed to delete session %s: %w", sessionId, err)
 	}
+
+	if c.sessionId == sessionId {
+		c.sessionId = ""
+	}
+
 	return nil
 }
