feat: add jsonpb marshallers (#3165)

v2fly · Oct 12, 2024 · 6a242d1 · 6a242d1
1 parent 229b30d
commit 6a242d1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/common/net/address.go b/common/net/address.go
@@ -221,3 +221,9 @@ func (d *IPOrDomain) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, bytes []by
 	d.Address = result.Address
 	return nil
 }
+
+func (d *IPOrDomain) MarshalJSONPB(marshaler *jsonpb.Marshaler) ([]byte, error) {
+	ipod := d.AsAddress().String()
+
+	return json.Marshal(ipod)
+}
diff --git a/common/net/network.go b/common/net/network.go
@@ -37,6 +37,16 @@ func (nl *NetworkList) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, bytes []
 	return newError("unknown format of a string list: " + string(bytes))
 }
 
+func (nl *NetworkList) MarshalJSONPB(marshaler *jsonpb.Marshaler) ([]byte, error) {
+	networkStrList := make([]string, len(nl.Network))
+
+	for idx, network := range nl.Network {
+		networkStrList[idx] = network.String()
+	}
+
+	return json.Marshal(networkStrList)
+}
+
 // HasNetwork returns true if the network list has a certain network.
 func HasNetwork(list []Network, network Network) bool {
 	for _, value := range list {

diff --git a/proxy/shadowsocks/simplified/config.go b/proxy/shadowsocks/simplified/config.go
@@ -26,6 +26,12 @@ func (c *CipherTypeWrapper) UnmarshalJSONPB(unmarshaler *jsonpb.Unmarshaler, byt
 	return nil
 }
 
+func (c *CipherTypeWrapper) MarshalJSONPB(marshaler *jsonpb.Marshaler) ([]byte, error) {
+	method := c.Value.String()
+
+	return json.Marshal(method)
+}
+
 func init() {
 	common.Must(common.RegisterConfig((*ServerConfig)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
 		simplifiedServer := config.(*ServerConfig)