lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00
Code Issues Releases Wiki Activity

updated converter support for v5json

Browse Source
This commit is contained in:
Shelikhoo 2021-09-05 11:27:56 +01:00
parent 2c0dec18b5
commit b90ae53c7d
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/browserforwarder/config.proto
View File

@ -7,8 +7,12 @@ option go_package = "github.com/v2fly/v2ray-core/v4/app/browserforwarder";
option java_package = "com.v2ray.core.app.browserforwarder"; option java_package = "com.v2ray.core.app.browserforwarder";
option java_multiple_files = true; option java_multiple_files = true;
import "common/protoext/extensions.proto";
// Config is the settings for BrowserForwarder. // Config is the settings for BrowserForwarder.
message Config { message Config {
option (v2ray.core.common.protoext.message_opt).type = "transport";
option (v2ray.core.common.protoext.message_opt).short_name = "ws";
string listen_addr = 1; string listen_addr = 1;
int32 listen_port = 2; int32 listen_port = 2;
} }

25
main/commands/all/jsonv4/convert.go
View File

@ -14,7 +14,6 @@ import (
core "github.com/v2fly/v2ray-core/v4" core "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/infra/conf/merge" "github.com/v2fly/v2ray-core/v4/infra/conf/merge"
"github.com/v2fly/v2ray-core/v4/infra/conf/serial"
"github.com/v2fly/v2ray-core/v4/main/commands/base" "github.com/v2fly/v2ray-core/v4/main/commands/base"
"github.com/v2fly/v2ray-core/v4/main/commands/helpers" "github.com/v2fly/v2ray-core/v4/main/commands/helpers"
) )
@ -81,7 +80,11 @@ func executeConvert(cmd *base.Command, args []string) {
inputFormat = strings.ToLower(inputFormat) inputFormat = strings.ToLower(inputFormat)
outputFormat = strings.ToLower(outputFormat) outputFormat = strings.ToLower(outputFormat)
m, err := helpers.LoadConfigToMap(cmd.Flag.Args(), inputFormat, confDirRecursively) inputFormatMerge := inputFormat
if inputFormat == "jsonv5" {
inputFormatMerge = "json"
}
m, err := helpers.LoadConfigToMap(cmd.Flag.Args(), inputFormatMerge, confDirRecursively)
if err != nil { if err != nil {
base.Fatalf("failed to merge: %s", err) base.Fatalf("failed to merge: %s", err)
} }
@ -113,11 +116,7 @@ func executeConvert(cmd *base.Command, args []string) {
base.Fatalf("failed to marshal json: %s", err) base.Fatalf("failed to marshal json: %s", err)
} }
r := bytes.NewReader(data) r := bytes.NewReader(data)
cf, err := serial.DecodeJSONConfig(r) pbConfig, err := core.LoadConfig(inputFormat, r)
if err != nil {
base.Fatalf("failed to decode json: %s", err)
}
pbConfig, err := cf.Build()
if err != nil { if err != nil {
base.Fatalf(err.Error()) base.Fatalf(err.Error())
} }
@ -131,11 +130,7 @@ func executeConvert(cmd *base.Command, args []string) {
base.Fatalf("failed to marshal json: %s", err) base.Fatalf("failed to marshal json: %s", err)
} }
r := bytes.NewReader(data) r := bytes.NewReader(data)
cf, err := serial.DecodeJSONConfig(r) pbConfig, err := core.LoadConfig(inputFormat, r)
if err != nil {
base.Fatalf("failed to decode json: %s", err)
}
pbConfig, err := cf.Build()
if err != nil { if err != nil {
base.Fatalf(err.Error()) base.Fatalf(err.Error())
} }
@ -151,11 +146,7 @@ func executeConvert(cmd *base.Command, args []string) {
base.Fatalf("failed to marshal json: %s", err) base.Fatalf("failed to marshal json: %s", err)
} }
r := bytes.NewReader(data) r := bytes.NewReader(data)
cf, err := serial.DecodeJSONConfig(r) pbConfig, err := core.LoadConfig(inputFormat, r)
if err != nil {
base.Fatalf("failed to decode json: %s", err)
}
pbConfig, err := cf.Build()
if err != nil { if err != nil {
base.Fatalf(err.Error()) base.Fatalf(err.Error())
} }