feat: DriverSession Get and Reset

hrp/internal/version/VERSION

@@ -1 +1 @@
-v5.0.0+2411142009
+v5.0.0+2411142130

hrp/pkg/uixt/android_adb_driver.go

@@ -44,7 +44,7 @@ func NewAdbDriver() *adbDriver {
 }
 
 func (ad *adbDriver) NewSession(capabilities Capabilities) (sessionInfo SessionInfo, err error) {
-	ad.Driver.session.Init()
+	ad.Driver.session.Reset()
 	err = errDriverNotImplemented
 	return
 }

hrp/pkg/uixt/android_stub_driver.go

@@ -95,7 +95,7 @@ func (sad *stubAndroidDriver) httpPOST(data interface{}, pathElem ...string) (ra
 }
 
 func (sad *stubAndroidDriver) NewSession(capabilities Capabilities) (SessionInfo, error) {
-	sad.Driver.session.Init()
+	sad.Driver.session.Reset()
 	return SessionInfo{}, errDriverNotImplemented
 }
 

hrp/pkg/uixt/android_uia2_driver.go

@@ -155,7 +155,7 @@ func (ud *uiaDriver) NewSession(capabilities Capabilities) (sessionInfo SessionI
 		return SessionInfo{SessionId: ""}, err
 	}
 	sessionID := reply.Value.SessionId
-	ud.Driver.session.Init()
+	ud.Driver.session.Reset()
 	ud.Driver.session.ID = sessionID
 	// d.sessionIdCache[sessionID] = true
 	return SessionInfo{SessionId: sessionID}, nil

hrp/pkg/uixt/client.go

@@ -19,43 +19,38 @@ type DriverSession struct {
 	ID string
 	// cache uia2/wda request and response
 	requests []*DriverResult
-	// cache session screenshot ocr results, key is image path, value is ScreenResult
+	// cache screenshot ocr results
-	screenResults ScreenResultMap
+	screenResults []*ScreenResult // list of actions
 	// cache e2e delay
 	e2eDelay []timeLog
 }
 
 func (d *DriverSession) addScreenResult(screenResult *ScreenResult) {
-	d.screenResults[screenResult.ImagePath] = screenResult
+	d.screenResults = append(d.screenResults, screenResult)
 }
 
 func (d *DriverSession) addRequestResult(driverResult *DriverResult) {
 	d.requests = append(d.requests, driverResult)
 }
 
-func (d *DriverSession) Init() {
+func (d *DriverSession) Reset() {
-	d.screenResults = make(map[string]*ScreenResult)
+	d.screenResults = make([]*ScreenResult, 0)
-	d.requests = nil
+	d.requests = make([]*DriverResult, 0)
 	d.e2eDelay = nil
 }
 
-func (d *DriverSession) GetAll() map[string]interface{} {
+func (d *DriverSession) Get(withReset bool) map[string]interface{} {
-	screenShots := make([]string, 0)
-	screenShotsUrls := make(map[string]string)
-	for _, screenResult := range d.screenResults {
-		screenShots = append(screenShots, screenResult.ImagePath)
-		if screenResult.UploadedURL == "" {
-			continue
-		}
-		screenShotsUrls[screenResult.ImagePath] = screenResult.UploadedURL
-	}
-
 	data := map[string]interface{}{
-		"screenshots":      screenShots,
+		"screen_results": d.screenResults,
-		"screenshots_urls": screenShotsUrls,
+	}
-		"screen_results":   d.screenResults,
+	if len(d.e2eDelay) != 0 {
-		"requests":         d.requests,
+		data["requests"] = d.requests
-		"e2e_results":      d.e2eDelay,
+	}
+	if d.e2eDelay != nil {
+		data["e2e_results"] = d.e2eDelay
+	}
+	if withReset {
+		d.Reset()
 	}
 	return data
 }

hrp/pkg/uixt/harmony_hdc_driver.go

@@ -40,7 +40,7 @@ func newHarmonyDriver(device *ghdc.Device) (driver *hdcDriver, err error) {
 }
 
 func (hd *hdcDriver) NewSession(capabilities Capabilities) (SessionInfo, error) {
-	hd.Driver.session.Init()
+	hd.Driver.session.Reset()
 	hd.Unlock()
 	return SessionInfo{}, errDriverNotImplemented
 }

hrp/pkg/uixt/ios_driver.go

@@ -108,7 +108,7 @@ func (wd *wdaDriver) NewSession(capabilities Capabilities) (sessionInfo SessionI
 	if sessionInfo, err = rawResp.valueConvertToSessionInfo(); err != nil {
 		return SessionInfo{}, err
 	}
-	wd.Driver.session.Init()
+	wd.Driver.session.Reset()
 	wd.Driver.session.ID = sessionInfo.SessionId
 	return
 }

hrp/pkg/uixt/screenshot.go

@@ -32,8 +32,6 @@ type ScreenResult struct {
 	Popup       *PopupInfo  `json:"popup,omitempty"`
 }
 
-type ScreenResultMap map[string]*ScreenResult // key is date time
-
 // GetScreenResult takes a screenshot, returns the image recognition result
 func (dExt *DriverExt) GetScreenResult(options ...ActionOption) (screenResult *ScreenResult, err error) {
 	actionOptions := NewActionOptions(options...)

hrp/step_mobile_ui.go

@@ -682,7 +682,7 @@ func runStepMobileUI(s *SessionRunner, step IStep) (stepResult *StepResult, err
 
 		// save attachments
 		session := uiDriver.Driver.GetSession()
-		for key, value := range session.GetAll() {
+		for key, value := range session.Get(true) {
 			attachments[key] = value
 		}
 		stepResult.Attachments = attachments