1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00

added root config builder

This commit is contained in:
Shelikhoo 2021-09-04 18:45:02 +01:00
parent 2560e79ef0
commit 1ec9a41ee8
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 79 additions and 6 deletions

73
infra/conf/v5cfg/root.go Normal file
View File

@ -0,0 +1,73 @@
package v5cfg
import (
"context"
"github.com/golang/protobuf/proto"
core "github.com/v2fly/v2ray-core/v4"
"github.com/v2fly/v2ray-core/v4/app/dispatcher"
"github.com/v2fly/v2ray-core/v4/app/proxyman"
"github.com/v2fly/v2ray-core/v4/common/serial"
"github.com/v2fly/v2ray-core/v4/infra/conf/synthetic/log"
"google.golang.org/protobuf/types/known/anypb"
)
func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) {
config := &core.Config{
App: []*anypb.Any{
serial.ToTypedMessage(&dispatcher.Config{}),
serial.ToTypedMessage(&proxyman.InboundConfig{}),
serial.ToTypedMessage(&proxyman.OutboundConfig{}),
},
}
var logConfMsg *anypb.Any
if c.LogConfig != nil {
logConfMsg = serial.ToTypedMessage(c.LogConfig.Build())
} else {
logConfMsg = serial.ToTypedMessage(log.DefaultLogConfig())
}
// let logger module be the first App to start,
// so that other modules could print log during initiating
config.App = append([]*anypb.Any{logConfMsg}, config.App...)
if c.RouterConfig != nil {
routerConfig, err := c.RouterConfig.Build()
if err != nil {
return nil, err
}
config.App = append(config.App, serial.ToTypedMessage(routerConfig))
}
if c.DNSConfig != nil {
dnsApp, err := c.DNSConfig.Build()
if err != nil {
return nil, newError("failed to parse DNS config").Base(err)
}
config.App = append(config.App, serial.ToTypedMessage(dnsApp))
}
for _, rawInboundConfig := range c.Inbounds {
ic, err := rawInboundConfig.BuildV5(ctx)
if err != nil {
return nil, err
}
config.Inbound = append(config.Inbound, ic.(*core.InboundHandlerConfig))
}
for _, rawOutboundConfig := range c.Outbounds {
ic, err := rawOutboundConfig.BuildV5(ctx)
if err != nil {
return nil, err
}
config.Outbound = append(config.Outbound, ic.(*core.OutboundHandlerConfig))
}
for serviceName, service := range c.Services {
servicePackedConfig, err := loadHeterogeneousConfigFromRawJson("inbound", serviceName, service)
if err != nil {
return nil, err
}
config.App = append(config.App, serial.ToTypedMessage(servicePackedConfig))
}
return config, nil
}

View File

@ -13,9 +13,9 @@ import (
)
type RootConfig struct {
Log log.LogConfig `json:"log"`
DNS dns.DNSConfig `json:"dns"`
Router router.RouterConfig `json:"router"`
LogConfig *log.LogConfig `json:"log"`
DNSConfig *dns.DNSConfig `json:"dns"`
RouterConfig *router.RouterConfig `json:"router"`
Inbounds []InboundConfig `json:"inbounds"`
Outbounds []OutboundConfig `json:"outbounds"`
Services map[string]json.RawMessage `json:"services"`