lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

Feat: add bytes support to v5 configuration

Browse Source
This commit is contained in:
秋のかえで 2022-05-10 12:22:23 +08:00 committed by Xiaokang Wang (Shelikhoo)
parent 28d197b6f3
commit 2e1d542a5c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
infra/conf/v5cfg/init.go
View File

@ -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,