merge master

hrp/cmd/adb/install.go

@@ -0,0 +1,62 @@
+package adb
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
+	"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
+)
+
+var installCmd = &cobra.Command{
+	Use:   "install [flags] PACKAGE",
+	Short: "Push package to the device and install them atomically",
+	Args:  cobra.MinimumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) (err error) {
+		startTime := time.Now()
+		defer func() {
+			sdk.SendGA4Event("hrp_adb_devices", map[string]interface{}{
+				"args":                 strings.Join(args, "-"),
+				"success":              err == nil,
+				"engagement_time_msec": time.Since(startTime).Milliseconds(),
+			})
+		}()
+		_, err = getDevice(serial)
+		if err != nil {
+			return err
+		}
+
+		device, err := uixt.NewAndroidDevice(uixt.WithSerialNumber(serial))
+		if err != nil {
+			fmt.Println(err)
+			return err
+		}
+		driverExt, err := device.NewDriver()
+		if err != nil {
+			fmt.Println(err)
+			return err
+		}
+		replace, _ := cmd.Flags().GetBool("replace")
+		downgrade, _ := cmd.Flags().GetBool("downgrade")
+		grant, _ := cmd.Flags().GetBool("grant")
+
+		err = driverExt.Install(args[0], uixt.NewInstallOptions(uixt.WithReinstall(replace), uixt.WithDowngrade(downgrade), uixt.WithGrantPermission(grant)))
+		if err != nil {
+			fmt.Println(err)
+			return err
+		}
+		fmt.Println("success")
+		return nil
+	},
+}
+
+func init() {
+	installCmd.Flags().StringVarP(&serial, "serial", "s", "", "filter by device's serial")
+	installCmd.Flags().BoolP("replace", "r", false, "replace existing application")
+	installCmd.Flags().BoolP("downgrade", "d", false, "allow version code downgrade (debuggable packages only)")
+	installCmd.Flags().BoolP("grant", "g", false, "grant all runtime permissions")
+	androidRootCmd.AddCommand(installCmd)
+}

hrp/cmd/ios/install.go

@@ -0,0 +1,52 @@
+package ios
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/sdk"
+	"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
+)
+
+var installCmd = &cobra.Command{
+	Use:   "install [flags] PACKAGE",
+	Short: "Push package to the device and install them atomically",
+	Args:  cobra.MinimumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) (err error) {
+		startTime := time.Now()
+		defer func() {
+			sdk.SendGA4Event("hrp_adb_devices", map[string]interface{}{
+				"args":                 strings.Join(args, "-"),
+				"success":              err == nil,
+				"engagement_time_msec": time.Since(startTime).Milliseconds(),
+			})
+		}()
+		_, err = getDevice(udid)
+		if err != nil {
+			return err
+		}
+
+		device, err := uixt.NewIOSDevice(uixt.WithUDID(udid))
+		if err != nil {
+			fmt.Println(err)
+			return err
+		}
+
+		err = device.Install(args[0], uixt.NewInstallOptions())
+		if err != nil {
+			fmt.Println(err)
+			return err
+		}
+		fmt.Println("success")
+		return nil
+	},
+}
+
+func init() {
+	installCmd.Flags().StringVarP(&udid, "serial", "s", "", "filter by device's serial")
+
+	iosRootCmd.AddCommand(installCmd)
+}

hrp/cmd/server.go

@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/httprunner/httprunner/v4/hrp/pkg/server"
+)
+
+// serverCmd represents the server command
+var serverCmd = &cobra.Command{
+	Use:   "server start",
+	Short: "start hrp server",
+	Long:  `start hrp server. exec automation by http`,
+	Args:  cobra.MinimumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return server.NewServer(port)
+	},
+}
+
+var port int
+
+func init() {
+	rootCmd.AddCommand(serverCmd)
+	serverCmd.Flags().IntVarP(&port, "port", "p", 8082, "Port to run the server on")
+}