diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go index 04aef5e4e..bf33dafd3 100644 --- a/app/commander/config.pb.go +++ b/app/commander/config.pb.go @@ -85,6 +85,45 @@ func (x *Config) GetService() []*serial.TypedMessage { return nil } +// ReflectionConfig is the placeholder config for ReflectionService. +type ReflectionConfig struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *ReflectionConfig) Reset() { + *x = ReflectionConfig{} + if protoimpl.UnsafeEnabled { + mi := &file_app_commander_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ReflectionConfig) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ReflectionConfig) ProtoMessage() {} + +func (x *ReflectionConfig) ProtoReflect() protoreflect.Message { + mi := &file_app_commander_config_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ReflectionConfig.ProtoReflect.Descriptor instead. +func (*ReflectionConfig) Descriptor() ([]byte, []int) { + return file_app_commander_config_proto_rawDescGZIP(), []int{1} +} + var File_app_commander_config_proto protoreflect.FileDescriptor var file_app_commander_config_proto_rawDesc = []byte{ @@ -99,13 +138,14 @@ var file_app_commander_config_proto_rawDesc = []byte{ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x07, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x59, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x76, - 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x63, 0x6f, - 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x1c, 0x76, 0x32, 0x72, 0x61, 0x79, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0xaa, 0x02, 0x18, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, - 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, - 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x52, 0x65, 0x66, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x59, 0x0a, 0x1c, 0x63, + 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, + 0x70, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x1c, 0x76, + 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x61, 0x70, + 0x70, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0xaa, 0x02, 0x18, 0x56, 0x32, + 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x43, 0x6f, 0x6d, + 0x6d, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -120,13 +160,14 @@ func file_app_commander_config_proto_rawDescGZIP() []byte { return file_app_commander_config_proto_rawDescData } -var file_app_commander_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_app_commander_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_app_commander_config_proto_goTypes = []interface{}{ (*Config)(nil), // 0: v2ray.core.app.commander.Config - (*serial.TypedMessage)(nil), // 1: v2ray.core.common.serial.TypedMessage + (*ReflectionConfig)(nil), // 1: v2ray.core.app.commander.ReflectionConfig + (*serial.TypedMessage)(nil), // 2: v2ray.core.common.serial.TypedMessage } var file_app_commander_config_proto_depIdxs = []int32{ - 1, // 0: v2ray.core.app.commander.Config.service:type_name -> v2ray.core.common.serial.TypedMessage + 2, // 0: v2ray.core.app.commander.Config.service:type_name -> v2ray.core.common.serial.TypedMessage 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -152,6 +193,18 @@ func file_app_commander_config_proto_init() { return nil } } + file_app_commander_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ReflectionConfig); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -159,7 +212,7 @@ func file_app_commander_config_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_app_commander_config_proto_rawDesc, NumEnums: 0, - NumMessages: 1, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, diff --git a/app/commander/config.proto b/app/commander/config.proto index 44031f708..637202b75 100644 --- a/app/commander/config.proto +++ b/app/commander/config.proto @@ -16,3 +16,6 @@ message Config { // interface. repeated v2ray.core.common.serial.TypedMessage service = 2; } + +// ReflectionConfig is the placeholder config for ReflectionService. +message ReflectionConfig {} diff --git a/app/commander/service.go b/app/commander/service.go index c25816e40..cf4e6a804 100644 --- a/app/commander/service.go +++ b/app/commander/service.go @@ -3,7 +3,11 @@ package commander import ( + "context" + "google.golang.org/grpc" + "google.golang.org/grpc/reflection" + "v2ray.com/core/common" ) // Service is a Commander service. @@ -11,3 +15,15 @@ type Service interface { // Register registers the service itself to a gRPC server. Register(*grpc.Server) } + +type reflectionService struct{} + +func (r reflectionService) Register(s *grpc.Server) { + reflection.Register(s) +} + +func init() { + common.Must(common.RegisterConfig((*ReflectionConfig)(nil), func(ctx context.Context, cfg interface{}) (interface{}, error) { + return reflectionService{}, nil + })) +} diff --git a/infra/conf/api.go b/infra/conf/api.go index 0e165c2c4..e644fd0b2 100644 --- a/infra/conf/api.go +++ b/infra/conf/api.go @@ -23,6 +23,8 @@ func (c *APIConfig) Build() (*commander.Config, error) { services := make([]*serial.TypedMessage, 0, 16) for _, s := range c.Services { switch strings.ToLower(s) { + case "reflectionservice": + services = append(services, serial.ToTypedMessage(&commander.ReflectionConfig{})) case "handlerservice": services = append(services, serial.ToTypedMessage(&handlerservice.Config{})) case "loggerservice":