other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-07 21:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply JSON format to `xray api` commands' output

This commit is contained in:
RPRX 2020-12-04 14:03:07 +00:00 committed by GitHub
parent 0d772cd800
commit 0a9db2d3d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main/commands/all/api/shared.go
View File

@ -104,16 +104,30 @@ func fetchHTTPContent(target string) ([]byte, error) {
}
func showResponese(m proto.Message) {
if isNil(m) {
return
}
b := new(bytes.Buffer)
e := json.NewEncoder(b)
e.SetIndent("", " ")
e.SetEscapeHTML(false)
err := e.Encode(m)
msg := ""
bs, err := proto.Marshal(m)
if err != nil {
msg = err.Error()
msg = fmt.Sprintf("error: %s\n\n%v", err, m)
} else {
msg = string(bs)
msg = strings.TrimSpace(msg)
msg = strings.TrimSpace(b.String())
}
if msg == "" {
return
}
fmt.Println(msg)
}
func isNil(i interface{}) bool {
vi := reflect.ValueOf(i)
if vi.Kind() == reflect.Ptr {
return vi.IsNil()
}
return i == nil
}