|
@@ -1,6 +1,7 @@
|
|
|
package v5cfg
|
|
package v5cfg
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
|
+ "bytes"
|
|
|
"io"
|
|
"io"
|
|
|
|
|
|
|
|
core "github.com/v2fly/v2ray-core/v5"
|
|
core "github.com/v2fly/v2ray-core/v5"
|
|
@@ -30,6 +31,15 @@ func init() {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
return loadJSONConfig(data)
|
|
return loadJSONConfig(data)
|
|
|
|
|
+ case []byte:
|
|
|
|
|
+ r := &json.Reader{
|
|
|
|
|
+ Reader: bytes.NewReader(v),
|
|
|
|
|
+ }
|
|
|
|
|
+ data, err := buf.ReadAllToBytes(r)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ return nil, err
|
|
|
|
|
+ }
|
|
|
|
|
+ return loadJSONConfig(data)
|
|
|
case io.Reader:
|
|
case io.Reader:
|
|
|
data, err := buf.ReadAllToBytes(&json.Reader{
|
|
data, err := buf.ReadAllToBytes(&json.Reader{
|
|
|
Reader: v,
|
|
Reader: v,
|