lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

Allow client to submit a context in v2ray.New

Browse Source
This commit is contained in:
Shelikhoo 2020-06-18 11:19:05 +08:00
parent 8988dc32b9
commit a26534c79c
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
v2ray.go
View File

@ -92,6 +92,8 @@ type Instance struct {
features []features.Feature features []features.Feature
featureResolutions []resolution featureResolutions []resolution
running bool running bool
ctx context.Context
} }
func AddInboundHandler(server *Instance, config *InboundHandlerConfig) error { func AddInboundHandler(server *Instance, config *InboundHandlerConfig) error {
@ -104,7 +106,7 @@ func AddInboundHandler(server *Instance, config *InboundHandlerConfig) error {
if !ok { if !ok {
return newError("not an InboundHandler") return newError("not an InboundHandler")
} }
if err := inboundManager.AddHandler(context.Background(), handler); err != nil { if err := inboundManager.AddHandler(server.ctx, handler); err != nil {
return err return err
} }
return nil return nil
@ -130,7 +132,7 @@ func AddOutboundHandler(server *Instance, config *OutboundHandlerConfig) error {
if !ok { if !ok {
return newError("not an OutboundHandler") return newError("not an OutboundHandler")
} }
if err := outboundManager.AddHandler(context.Background(), handler); err != nil { if err := outboundManager.AddHandler(server.ctx, handler); err != nil {
return err return err
} }
return nil return nil
@ -157,27 +159,47 @@ func RequireFeatures(ctx context.Context, callback interface{}) error {
// The instance is not started at this point. // The instance is not started at this point.
// To ensure V2Ray instance works properly, the config must contain one Dispatcher, one InboundHandlerManager and one OutboundHandlerManager. Other features are optional. // To ensure V2Ray instance works properly, the config must contain one Dispatcher, one InboundHandlerManager and one OutboundHandlerManager. Other features are optional.
func New(config *Config) (*Instance, error) { func New(config *Config) (*Instance, error) {
var server = &Instance{} var server = &Instance{ctx: context.Background()}
err, done := initInstanceWithConfig(config, server)
if done {
return nil, err
}
return server, nil
}
func NewWithContext(config *Config, ctx context.Context) (*Instance, error) {
var server = &Instance{ctx: ctx}
err, done := initInstanceWithConfig(config, server)
if done {
return nil, err
}
return server, nil
}
func initInstanceWithConfig(config *Config, server *Instance) (error, bool) {
if config.Transport != nil { if config.Transport != nil {
features.PrintDeprecatedFeatureWarning("global transport settings") features.PrintDeprecatedFeatureWarning("global transport settings")
} }
if err := config.Transport.Apply(); err != nil { if err := config.Transport.Apply(); err != nil {
return nil, err return err, true
} }
for _, appSettings := range config.App { for _, appSettings := range config.App {
settings, err := appSettings.GetInstance() settings, err := appSettings.GetInstance()
if err != nil { if err != nil {
return nil, err return err, true
} }
obj, err := CreateObject(server, settings) obj, err := CreateObject(server, settings)
if err != nil { if err != nil {
return nil, err return err, true
} }
if feature, ok := obj.(features.Feature); ok { if feature, ok := obj.(features.Feature); ok {
if err := server.AddFeature(feature); err != nil { if err := server.AddFeature(feature); err != nil {
return nil, err return err, true
} }
} }
} }
@ -195,24 +217,23 @@ func New(config *Config) (*Instance, error) {
for _, f := range essentialFeatures { for _, f := range essentialFeatures {
if server.GetFeature(f.Type) == nil { if server.GetFeature(f.Type) == nil {
if err := server.AddFeature(f.Instance); err != nil { if err := server.AddFeature(f.Instance); err != nil {
return nil, err return err, true
} }
} }
} }
if server.featureResolutions != nil { if server.featureResolutions != nil {
return nil, newError("not all dependency are resolved.") return newError("not all dependency are resolved."), true
} }
if err := addInboundHandlers(server, config.Inbound); err != nil { if err := addInboundHandlers(server, config.Inbound); err != nil {
return nil, err return err, true
} }
if err := addOutboundHandlers(server, config.Outbound); err != nil { if err := addOutboundHandlers(server, config.Outbound); err != nil {
return nil, err return err, true
} }
return nil, false
return server, nil
} }
// Type implements common.HasType. // Type implements common.HasType.