增加lua调试功能

cmd/saastool/help.go

@@ -25,6 +25,7 @@ Commands:
     task               Task commands    
     target             Target commands
     bind               Bind commands
+    script             Script commands
 
 "help" is the default command.
 

cmd/saastool/main.go

@@ -36,6 +36,8 @@ func Run(args ...string) error {
 		return RunTarget(args...)
 	case "bind":
 		return RunBind(args...)
+	case "script":
+		return RunScript(args...)
 	default:
 		err := fmt.Errorf(`unknown command "%v"`+"\n"+`Run 'saastool help' for usage`, name)
 		fmt.Fprintln(os.Stderr, err.Error())

cmd/saastool/params.go

@@ -105,6 +105,18 @@ func paramIDs(fs *flag.FlagSet) *string {
 	return fs.String("ids", "", "IDs for delete. Use commas to separate multiple IDs")
 }
 
+func paramLua(fs *flag.FlagSet) *string {
+	return fs.String("lua", "", "LUA file name")
+}
+
+func paramDid(fs *flag.FlagSet) *string {
+	return fs.String("did", "", "device md5 (lower case)")
+}
+
+func paramOS(fs *flag.FlagSet) *uint {
+	return fs.Uint("os", 2, "1=iOS, 2=Android, default=2")
+}
+
 // ParseByteSize 解析字节大小字符串为字节数
 func ParseByteSize(sizeStr string) (uint64, error) {
 	sizeStr = strings.TrimSpace(sizeStr)

cmd/saastool/script.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+)
+
+func RunScript(args ...string) error {
+	name, args := ParseCommandName(args)
+
+	// 从参数中解析出命令
+	switch name {
+	case "", "help":
+		return RunScriptHelp(args...)
+	case "run":
+		return RunScriptRun(args...)
+	default:
+		err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool script help' for usage`, name)
+		fmt.Fprintln(os.Stderr, err)
+
+		return err
+	}
+}
+
+func RunScriptHelp(args ...string) error {
+	fmt.Println(strings.TrimSpace(scriptUsage))
+	return nil
+}
+
+const scriptUsage = `
+Usage:  saastoola script COMMAND [OPTIONS]
+
+Commands:
+    run                  Run lua script test on server
+
+"help" is the default command.
+
+Use "saastool script COMMAND -help" for more information about a command.
+`

cmd/saastool/script_run.go

@@ -0,0 +1,112 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+
+	"git.algo.com.cn/public/saasapi"
+	"git.algo.com.cn/public/saasapi/pkg/saashttp"
+)
+
+type scriptRunParams struct {
+	luaScript string
+	did       string
+	os        saasapi.OS
+	saasHttp  *saashttp.SaasClient
+}
+
+func RunScriptRun(args ...string) error {
+	fs := flag.NewFlagSet("run", flag.ExitOnError)
+	cfgFile := paramConfig(fs)
+	luaFile := paramLua(fs)
+	did := paramDid(fs)
+	tos := paramOS(fs)
+
+	if err := fs.Parse(args); err != nil {
+		fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
+		return err
+	}
+
+	if fs.NArg() > 0 || len(*luaFile) == 0 || len(*did) == 0 {
+		fs.PrintDefaults()
+		return nil
+	}
+
+	if !(*tos == 1 || *tos == 2) {
+		fmt.Fprintln(os.Stderr, "OS error")
+		return nil
+	}
+
+	file, err := os.Open(*luaFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "lua file error", "err", err)
+		return err
+	}
+	defer file.Close()
+
+	body, err := io.ReadAll(file)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "lua file read error", "err", err)
+		return err
+	}
+
+	cfg, err := LoadConfigFile(*cfgFile)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
+		return err
+	}
+
+	scriptRunParams := scriptRunParams{
+		luaScript: string(body),
+		did:       *did,
+		os:        saasapi.OS(*tos),
+		saasHttp: &saashttp.SaasClient{
+			Client:  &http.Client{},
+			ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls),
+			Auth:    &cfg.Auth,
+		},
+	}
+
+	return doScriptRun(scriptRunParams)
+}
+
+func doScriptRun(scriptRunParams scriptRunParams) error {
+	saasReq := &saasapi.SaasReq{
+		Cmd: &saasapi.SaasReq_ScriptRun{
+			ScriptRun: &saasapi.ScriptRun{
+				LuaScript: scriptRunParams.luaScript,
+				ServerDid: scriptRunParams.did,
+				Os:        scriptRunParams.os,
+			},
+		},
+	}
+
+	res, err := scriptRunParams.saasHttp.ScriptRun(saasReq)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "run script error", "err", err)
+		return err
+	}
+
+	if res.Code != saasapi.ErrorCode_SUCC {
+		err = fmt.Errorf("run script failed. code:%v, status:%v", res.Code, res.Status)
+		fmt.Fprintln(os.Stderr, err)
+		return err
+	}
+
+	scriptRunRes := res.GetScriptRunRes()
+	fmt.Println("ERROROUT_OUTPUT:")
+	fmt.Print(scriptRunRes.GetErrorOutput())
+	fmt.Println()
+	fmt.Println("PRINT_OUTPUT:")
+	fmt.Print(scriptRunRes.GetPrintOutput())
+	fmt.Println()
+	fmt.Println("DATASPACE_OUTPUT:")
+	fmt.Print(scriptRunRes.GetDataspaceOut())
+	fmt.Println()
+	fmt.Println("TARGETS_OUTPUT:")
+	fmt.Print(scriptRunRes.GetTargetsOutput())
+	return nil
+}