diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION deleted file mode 100644 index 7aa76f1c..00000000 --- a/hrp/internal/version/VERSION +++ /dev/null @@ -1 +0,0 @@ -v5.4.0 \ No newline at end of file diff --git a/internal/builtin/function.go b/internal/builtin/function.go index baf94a19..3da9ea55 100644 --- a/internal/builtin/function.go +++ b/internal/builtin/function.go @@ -47,10 +47,6 @@ func escapeQuotes(s string) string { return quoteEscaper.Replace(s) } -func init() { - rand.Seed(time.Now().UnixNano()) -} - func random_range(a, b float64) float64 { return a + rand.Float64()*(b-a) } diff --git a/internal/builtin/utils.go b/internal/builtin/utils.go index 20eb363c..5a8e23a7 100644 --- a/internal/builtin/utils.go +++ b/internal/builtin/utils.go @@ -356,7 +356,6 @@ func ConvertToStringSlice(val interface{}) ([]string, error) { func GetFreePort() (int, error) { minPort := 20000 maxPort := 50000 - rand.Seed(time.Now().UnixNano()) for i := 0; i < 10; i++ { port := rand.Intn(maxPort-minPort+1) + minPort addr := fmt.Sprintf("0.0.0.0:%d", port) @@ -366,7 +365,7 @@ func GetFreePort() (int, error) { return port, nil } } - return 0, errors.New("failed to find available port in range") + return 0, errors.New("failed to get available port") } func GetCurrentDay() string { diff --git a/internal/version/VERSION b/internal/version/VERSION index 14b14007..8869c706 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0+2503032034 +v5.0.0+2503032054 diff --git a/pkg/uixt/1234.jpeg b/pkg/uixt/1234.jpeg deleted file mode 100644 index 72e634a8..00000000 Binary files a/pkg/uixt/1234.jpeg and /dev/null differ diff --git a/pkg/uixt/browser_web_driver.go b/pkg/uixt/browser_web_driver.go index 598b2abc..52dbed9c 100644 --- a/pkg/uixt/browser_web_driver.go +++ b/pkg/uixt/browser_web_driver.go @@ -67,7 +67,6 @@ func CreateBrowser(timeout int) (browserInfo *BrowserInfo, err error) { Timeout: 30 * time.Second, // 设置超时时间为5秒 } resp, err := client.Do(req) - if err != nil { return nil, err } @@ -135,7 +134,6 @@ func (wd *BrowserWebDriver) AppLaunch(packageName string) (err error) { } func (wd *BrowserWebDriver) DeleteSession() (err error) { - url := wd.concatURL("context", wd.sessionId) req, err := http.NewRequest("DELETE", url, nil) @@ -146,7 +144,6 @@ func (wd *BrowserWebDriver) DeleteSession() (err error) { Timeout: 60 * time.Second, // 设置超时时间为5秒 } resp, err := client.Do(req) - if err != nil { return err } @@ -301,13 +298,11 @@ func (wd *BrowserWebDriver) Input(text string, option ...option.ActionOption) (e // Source Return application elements tree func (wd *BrowserWebDriver) Source(srcOpt ...option.SourceOption) (string, error) { resp, err := wd.HttpGet(http.MethodGet, wd.sessionId, "stub/source") - if err != nil { return "", err } jsonData, err := json.Marshal(resp.Data) - if err != nil { return "", err } @@ -340,7 +335,6 @@ func (wd *BrowserWebDriver) HttpPOST(data interface{}, pathElem ...string) (resp } func (wd *BrowserWebDriver) HttpGet(data interface{}, pathElem ...string) (response *WebAgentResponse, err error) { - return wd.httpRequest(http.MethodGet, wd.concatURL(pathElem...), nil) } @@ -364,7 +358,6 @@ func (wd *BrowserWebDriver) httpRequest(method string, rawURL string, rawBody [] Timeout: 60 * time.Second, // 设置超时时间为5秒 } resp, err := client.Do(req) - if err != nil { return nil, err } @@ -424,6 +417,7 @@ func (wd *BrowserWebDriver) WindowSize() (types.Size, error) { func (wd *BrowserWebDriver) Screen() (Screen, error) { return Screen{}, errors.New("not support") } + func (wd *BrowserWebDriver) Scale() (float64, error) { return 0, errors.New("not support") } @@ -460,6 +454,7 @@ func (wd *BrowserWebDriver) Back() error { func (wd *BrowserWebDriver) AppClear(packageName string) error { return errors.New("not support") } + func (wd *BrowserWebDriver) ClearImages() error { return errors.New("not support") } @@ -502,6 +497,7 @@ func (wd *BrowserWebDriver) DoubleTap(x, y float64, options ...option.ActionOpti _, err := wd.HttpPOST(data, wd.sessionId, "ui/double_tap") return err } + func (wd *BrowserWebDriver) UploadFile(x, y float64, FileUrl, FileFormat string) (err error) { data := map[string]interface{}{ "x": x, @@ -543,6 +539,7 @@ func (wd *BrowserWebDriver) SendKeys(text string, options ...option.ActionOption func (wd *BrowserWebDriver) Clear(packageName string) error { return errors.New("not support") } + func (wd *BrowserWebDriver) Setup() error { return nil } @@ -590,9 +587,11 @@ func (wd *BrowserWebDriver) AccessibleSource() (string, error) { func (wd *BrowserWebDriver) HealthCheck() error { return errors.New("not support") } + func (wd *BrowserWebDriver) GetAppiumSettings() (map[string]interface{}, error) { return nil, errors.New("not support") } + func (wd *BrowserWebDriver) SetAppiumSettings(settings map[string]interface{}) (map[string]interface{}, error) { return nil, errors.New("not support") } @@ -605,9 +604,11 @@ func (wd *BrowserWebDriver) IsHealthy() (bool, error) { func (wd *BrowserWebDriver) StartCaptureLog(identifier ...string) (err error) { return errors.New("not support") } + func (wd *BrowserWebDriver) StopCaptureLog() (result interface{}, err error) { return nil, errors.New("not support") } + func (wd *BrowserWebDriver) RecordScreen(folderPath string, duration time.Duration) (videoPath string, err error) { return "", errors.New("not support") } diff --git a/pkg/uixt/driver.go b/pkg/uixt/driver.go index ad63ca04..bf0b6ea1 100644 --- a/pkg/uixt/driver.go +++ b/pkg/uixt/driver.go @@ -118,5 +118,6 @@ type IBrowserWebDriver interface { Hover(x, y float64) (err error) RightClick(x, y float64) (err error) Scroll(delta int) (err error) + // TODO: move x,y parameters to option UploadFile(x, y float64, FileUrl, FileFormat string) (err error) }