mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-11 01:23:01 +00:00
Commands: Use creflect.MarshalToJson() as output (#3674)
This commit is contained in:
parent
498d8eb3cc
commit
f0547bc04d
@ -1,6 +1,7 @@
|
|||||||
package reflect
|
package reflect
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
@ -13,13 +14,22 @@ import (
|
|||||||
|
|
||||||
func MarshalToJson(v interface{}, insertTypeInfo bool) (string, bool) {
|
func MarshalToJson(v interface{}, insertTypeInfo bool) (string, bool) {
|
||||||
if itf := marshalInterface(v, true, insertTypeInfo); itf != nil {
|
if itf := marshalInterface(v, true, insertTypeInfo); itf != nil {
|
||||||
if b, err := json.MarshalIndent(itf, "", " "); err == nil {
|
if b, err := JSONMarshalWithoutEscape(itf); err == nil {
|
||||||
return string(b[:]), true
|
return string(b[:]), true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func JSONMarshalWithoutEscape(t interface{}) ([]byte, error) {
|
||||||
|
buffer := &bytes.Buffer{}
|
||||||
|
encoder := json.NewEncoder(buffer)
|
||||||
|
encoder.SetIndent("", " ")
|
||||||
|
encoder.SetEscapeHTML(false)
|
||||||
|
err := encoder.Encode(t)
|
||||||
|
return buffer.Bytes(), err
|
||||||
|
}
|
||||||
|
|
||||||
func marshalTypedMessage(v *cserial.TypedMessage, ignoreNullValue bool, insertTypeInfo bool) interface{} {
|
func marshalTypedMessage(v *cserial.TypedMessage, ignoreNullValue bool, insertTypeInfo bool) interface{} {
|
||||||
if v == nil {
|
if v == nil {
|
||||||
return nil
|
return nil
|
||||||
|
@ -13,10 +13,10 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"google.golang.org/grpc/credentials/insecure"
|
"google.golang.org/grpc/credentials/insecure"
|
||||||
"google.golang.org/protobuf/encoding/protojson"
|
|
||||||
|
|
||||||
"github.com/xtls/xray-core/common/buf"
|
"github.com/xtls/xray-core/common/buf"
|
||||||
"github.com/xtls/xray-core/main/commands/base"
|
"github.com/xtls/xray-core/main/commands/base"
|
||||||
|
creflect "github.com/xtls/xray-core/common/reflect"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
)
|
)
|
||||||
@ -107,20 +107,16 @@ func fetchHTTPContent(target string) ([]byte, error) {
|
|||||||
return content, nil
|
return content, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func protoToJSONString(m proto.Message, prefix, indent string) (string, error) {
|
|
||||||
return strings.TrimSpace(protojson.MarshalOptions{Indent: indent}.Format(m)), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func showJSONResponse(m proto.Message) {
|
func showJSONResponse(m proto.Message) {
|
||||||
if isNil(m) {
|
if isNil(m) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
output, err := protoToJSONString(m, "", " ")
|
if j, ok := creflect.MarshalToJson(m, true); ok {
|
||||||
if err != nil {
|
fmt.Println(j)
|
||||||
|
} else {
|
||||||
fmt.Fprintf(os.Stdout, "%v\n", m)
|
fmt.Fprintf(os.Stdout, "%v\n", m)
|
||||||
base.Fatalf("error encode json: %s", err)
|
base.Fatalf("error encode json")
|
||||||
}
|
}
|
||||||
fmt.Println(output)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func isNil(i interface{}) bool {
|
func isNil(i interface{}) bool {
|
||||||
|
Loading…
Reference in New Issue
Block a user