GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-28 02:51:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor & fix: stub driver and server

Browse Source
This commit is contained in:
lilong.129
2025-03-04 17:26:55 +08:00
parent b195760ed9
commit 7f837c9e36
16 changed files with 75 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/app.go
View File

@@ -60,7 +60,7 @@ func (r *Router) clearAppHandler(c *gin.Context) {
if err != nil {
return
}
err = driver.GetIDriver().AppClear(appClearReq.PackageName)
err = driver.AppClear(appClearReq.PackageName)
if err != nil {
RenderError(c, err)
return

13
server/context.go
View File

@@ -14,12 +14,17 @@ import (
"github.com/httprunner/httprunner/v5/pkg/uixt/option"
)
func (p RouterBaseMethod) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver, err error) {
func (r *Router) GetDriver(c *gin.Context) (driverExt *uixt.XTDriver, err error) {
driverObj, exists := c.Get("driver")
if exists {
return driverObj.(*uixt.XTDriver), nil
}
deviceObj, exists := c.Get("device")
var device uixt.IDevice
var driver uixt.IDriver
if !exists {
device, err = p.GetDevice(c)
device, err = r.GetDevice(c)
if err != nil {
return nil, err
}
@@ -32,14 +37,14 @@ func (p RouterBaseMethod) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver, e
RenderErrorInitDriver(c, err)
return
}
c.Set("driver", driver)
driverExt = uixt.NewXTDriver(driver,
ai.WithCVService(ai.CVServiceTypeVEDEM))
c.Set("driver", driverExt)
return driverExt, nil
}
func (p RouterBaseMethod) GetDevice(c *gin.Context) (device uixt.IDevice, err error) {
func (r *Router) GetDevice(c *gin.Context) (device uixt.IDevice, err error) {
platform := c.Param("platform")
serial := c.Param("serial")
if serial == "" {

3
server/ext/app.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/driver_ext"
"github.com/httprunner/httprunner/v5/server"
)
@@ -21,7 +20,7 @@ func (r *RouterExt) installAppHandler(c *gin.Context) {
if err != nil {
return
}
err = driver.(*driver_ext.XTDriver).InstallByUrl(appInstallReq.AppUrl)
err = driver.InstallByUrl(appInstallReq.AppUrl)
if err != nil {
server.RenderError(c, err)
return

14
server/ext/context.go
View File

@@ -11,19 +11,24 @@ import (
"github.com/httprunner/httprunner/v5/server"
)
func (p RouterBaseMethodExt) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver, err error) {
platform := c.Param("platform")
func (r *RouterExt) GetDriver(c *gin.Context) (driverExt *driver_ext.StubXTDriver, err error) {
driverObj, exists := c.Get("driver")
if exists {
return driverObj.(*driver_ext.StubXTDriver), nil
}
deviceObj, exists := c.Get("device")
var device uixt.IDevice
var driver driver_ext.IStubDriver
if !exists {
device, err = p.GetDevice(c)
device, err = r.GetDevice(c)
if err != nil {
return nil, err
}
} else {
device = deviceObj.(uixt.IDevice)
}
platform := c.Param("platform")
switch strings.ToLower(platform) {
case "android":
driver, err = driver_ext.NewStubAndroidDriver(device.(*uixt.AndroidDevice))
@@ -36,7 +41,8 @@ func (p RouterBaseMethodExt) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver
server.RenderErrorInitDriver(c, err)
return
}
driverExt = driver_ext.NewXTDriver(driver,
driverExt = driver_ext.NewStubXTDriver(driver,
ai.WithCVService(ai.CVServiceTypeVEDEM))
c.Set("driver", driverExt)
return driverExt, nil

15
server/ext/handler.go
View File

@@ -1,11 +1,11 @@
package server_ext
import (
"github.com/gin-gonic/gin"
"github.com/rs/zerolog/log"
"time"
"github.com/httprunner/httprunner/v5/pkg/uixt/driver_ext"
"github.com/gin-gonic/gin"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v5/server"
)
@@ -20,9 +20,9 @@ func (r *RouterExt) loginHandler(c *gin.Context) {
if err != nil {
return
}
info, err := driver.GetIDriver().(driver_ext.IStubDriver).
LoginNoneUI(loginReq.PackageName, loginReq.PhoneNumber,
loginReq.Captcha, loginReq.Password)
info, err := driver.LoginNoneUI(
loginReq.PackageName, loginReq.PhoneNumber,
loginReq.Captcha, loginReq.Password)
if err != nil {
server.RenderError(c, err)
return
@@ -41,8 +41,7 @@ func (r *RouterExt) logoutHandler(c *gin.Context) {
if err != nil {
return
}
err = driver.GetIDriver().(driver_ext.IStubDriver).
LogoutNoneUI(logoutReq.PackageName)
err = driver.LogoutNoneUI(logoutReq.PackageName)
if err != nil {
server.RenderError(c, err)
return

11
server/ext/main.go
View File

@@ -1,7 +1,6 @@
package server_ext
import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/server"
)
@@ -9,23 +8,15 @@ type RouterExt struct {
*server.Router
}
type RouterBaseMethodExt struct {
server.RouterBaseMethod
}
func NewExtRouter() *RouterExt {
router := &RouterExt{
Router: &server.Router{
Engine: gin.Default(),
IRouterBaseMethod: &RouterBaseMethodExt{},
},
Router: server.NewRouter(),
}
router.Init()
return router
}
func (r *RouterExt) Init() {
r.Router.Init()
apiV1PlatformSerial := r.Group("/api/v1").Group("/:platform").Group("/:serial")
apiV1PlatformSerial.GET("/stub/source", r.sourceHandler)

2
server/key.go
View File

@@ -64,7 +64,7 @@ func (r *Router) keycodeHandler(c *gin.Context) {
return
}
// TODO FIXME
err = driver.GetIDriver().(*uixt.ADBDriver).
err = driver.IDriver.(*uixt.ADBDriver).
PressKeyCode(uixt.KeyCode(keycodeReq.Keycode), uixt.KMEmpty)
if err != nil {
RenderError(c, err)

16
server/main.go
View File

@@ -12,8 +12,7 @@ import (
func NewRouter() *Router {
router := &Router{
Engine: gin.Default(),
IRouterBaseMethod: &RouterBaseMethod{},
Engine: gin.Default(),
}
router.Init()
return router
@@ -21,15 +20,6 @@ func NewRouter() *Router {
type Router struct {
*gin.Engine
IRouterBaseMethod
}
type RouterBaseMethod struct {
}
type IRouterBaseMethod interface {
GetDriver(c *gin.Context) (driver uixt.IXTDriver, err error)
GetDevice(c *gin.Context) (driver uixt.IDevice, err error)
}
func (r *Router) Init() {
@@ -109,14 +99,14 @@ func (r *Router) teardown() gin.HandlerFunc {
driverObj, exists := c.Get("driver")
if exists {
if driver, ok := driverObj.(uixt.IXTDriver); ok {
if driver, ok := driverObj.(*uixt.XTDriver); ok {
_ = driver.TearDown()
}
}
deviceObj, exists := c.Get("device")
if exists {
if device, ok := deviceObj.(*uixt.IOSDevice); ok {
if device, ok := deviceObj.(uixt.IDevice); ok {
err := device.Teardown()
if err != nil {
log.Error().Err(err)

14
server/ui.go
View File

@@ -2,6 +2,7 @@ package server
import (
"github.com/gin-gonic/gin"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/option"
)
@@ -38,7 +39,8 @@ func (r *Router) rightClickHandler(c *gin.Context) {
if err != nil {
return
}
err = driver.GetWebDriver().RightClick(rightClickReq.X, rightClickReq.Y)
err = driver.IDriver.(*uixt.BrowserDriver).
RightClick(rightClickReq.X, rightClickReq.Y)
if err != nil {
RenderError(c, err)
return
@@ -58,7 +60,9 @@ func (r *Router) uploadHandler(c *gin.Context) {
RenderError(c, err)
return
}
err = driver.GetWebDriver().UploadFile(uploadRequest.X, uploadRequest.Y, uploadRequest.FileUrl, uploadRequest.FileFormat)
err = driver.IDriver.(*uixt.BrowserDriver).
UploadFile(uploadRequest.X, uploadRequest.Y,
uploadRequest.FileUrl, uploadRequest.FileFormat)
if err != nil {
c.Abort()
return
@@ -79,7 +83,8 @@ func (r *Router) hoverHandler(c *gin.Context) {
return
}
err = driver.GetWebDriver().Hover(hoverReq.X, hoverReq.Y)
err = driver.IDriver.(*uixt.BrowserDriver).
Hover(hoverReq.X, hoverReq.Y)
if err != nil {
RenderError(c, err)
@@ -101,7 +106,8 @@ func (r *Router) scrollHandler(c *gin.Context) {
return
}
err = driver.GetWebDriver().Scroll(scrollReq.Delta)
err = driver.IDriver.(*uixt.BrowserDriver).
Scroll(scrollReq.Delta)
if err != nil {
RenderError(c, err)