From 3401963b570b8338372191aecb909a40d43e5ca5 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Sat, 19 Jun 2021 10:49:34 +0100 Subject: [PATCH] multi-observer --- app/observatory/multiObservatory/config.pb.go | 163 ++++++++++++++++++ app/observatory/multiObservatory/config.proto | 13 ++ app/observatory/multiObservatory/muti.go | 38 ++++ 3 files changed, 214 insertions(+) create mode 100644 app/observatory/multiObservatory/config.pb.go create mode 100644 app/observatory/multiObservatory/config.proto create mode 100644 app/observatory/multiObservatory/muti.go diff --git a/app/observatory/multiObservatory/config.pb.go b/app/observatory/multiObservatory/config.pb.go new file mode 100644 index 000000000..e45ce9c42 --- /dev/null +++ b/app/observatory/multiObservatory/config.pb.go @@ -0,0 +1,163 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.26.0 +// protoc v3.15.6 +// source: app/observatory/multiObservatory/config.proto + +package multiObservatory + +import ( + taggedfeatures "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type Config struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Holders *taggedfeatures.Config `protobuf:"bytes,1,opt,name=holders,proto3" json:"holders,omitempty"` +} + +func (x *Config) Reset() { + *x = Config{} + if protoimpl.UnsafeEnabled { + mi := &file_app_observatory_multiObservatory_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Config) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Config) ProtoMessage() {} + +func (x *Config) ProtoReflect() protoreflect.Message { + mi := &file_app_observatory_multiObservatory_config_proto_msgTypes[0] + 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 Config.ProtoReflect.Descriptor instead. +func (*Config) Descriptor() ([]byte, []int) { + return file_app_observatory_multiObservatory_config_proto_rawDescGZIP(), []int{0} +} + +func (x *Config) GetHolders() *taggedfeatures.Config { + if x != nil { + return x.Holders + } + return nil +} + +var File_app_observatory_multiObservatory_config_proto protoreflect.FileDescriptor + +var file_app_observatory_multiObservatory_config_proto_rawDesc = []byte{ + 0x0a, 0x2d, 0x61, 0x70, 0x70, 0x2f, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, + 0x79, 0x2f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, + 0x72, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x2b, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, + 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x6d, 0x75, 0x6c, 0x74, + 0x69, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x1a, 0x24, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x74, 0x61, 0x67, 0x67, 0x65, 0x64, 0x66, 0x65, 0x61, 0x74, 0x75, + 0x72, 0x65, 0x73, 0x2f, 0x73, 0x6b, 0x65, 0x6c, 0x65, 0x74, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x4c, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x07, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, + 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x2e, 0x74, 0x61, 0x67, 0x67, 0x65, 0x64, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, + 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x07, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x73, + 0x42, 0xa2, 0x01, 0x0a, 0x2f, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, + 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, 0x74, + 0x6f, 0x72, 0x79, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, + 0x74, 0x6f, 0x72, 0x79, 0x50, 0x01, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, + 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x6f, 0x62, 0x73, 0x65, 0x72, + 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4f, 0x62, 0x73, 0x65, + 0x72, 0x76, 0x61, 0x74, 0x6f, 0x72, 0x79, 0xaa, 0x02, 0x2b, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, + 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x61, + 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4f, 0x62, 0x73, 0x65, 0x72, 0x76, + 0x61, 0x74, 0x6f, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_app_observatory_multiObservatory_config_proto_rawDescOnce sync.Once + file_app_observatory_multiObservatory_config_proto_rawDescData = file_app_observatory_multiObservatory_config_proto_rawDesc +) + +func file_app_observatory_multiObservatory_config_proto_rawDescGZIP() []byte { + file_app_observatory_multiObservatory_config_proto_rawDescOnce.Do(func() { + file_app_observatory_multiObservatory_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_app_observatory_multiObservatory_config_proto_rawDescData) + }) + return file_app_observatory_multiObservatory_config_proto_rawDescData +} + +var file_app_observatory_multiObservatory_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_app_observatory_multiObservatory_config_proto_goTypes = []interface{}{ + (*Config)(nil), // 0: v2ray.core.app.observatory.multiObservatory.Config + (*taggedfeatures.Config)(nil), // 1: v2ray.core.common.taggedfeatures.Config +} +var file_app_observatory_multiObservatory_config_proto_depIdxs = []int32{ + 1, // 0: v2ray.core.app.observatory.multiObservatory.Config.holders:type_name -> v2ray.core.common.taggedfeatures.Config + 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 + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_app_observatory_multiObservatory_config_proto_init() } +func file_app_observatory_multiObservatory_config_proto_init() { + if File_app_observatory_multiObservatory_config_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_app_observatory_multiObservatory_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Config); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_app_observatory_multiObservatory_config_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_app_observatory_multiObservatory_config_proto_goTypes, + DependencyIndexes: file_app_observatory_multiObservatory_config_proto_depIdxs, + MessageInfos: file_app_observatory_multiObservatory_config_proto_msgTypes, + }.Build() + File_app_observatory_multiObservatory_config_proto = out.File + file_app_observatory_multiObservatory_config_proto_rawDesc = nil + file_app_observatory_multiObservatory_config_proto_goTypes = nil + file_app_observatory_multiObservatory_config_proto_depIdxs = nil +} diff --git a/app/observatory/multiObservatory/config.proto b/app/observatory/multiObservatory/config.proto new file mode 100644 index 000000000..91b3251f0 --- /dev/null +++ b/app/observatory/multiObservatory/config.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package v2ray.core.app.observatory.multiObservatory; +option csharp_namespace = "V2Ray.Core.App.Observatory.MultiObservatory"; +option go_package = "github.com/v2fly/v2ray-core/v4/app/observatory/multiObservatory"; +option java_package = "com.v2ray.core.app.observatory.multiObservatory"; +option java_multiple_files = true; + +import "common/taggedfeatures/skeleton.proto"; + +message Config{ + v2ray.core.common.taggedfeatures.Config holders = 1 ; +} \ No newline at end of file diff --git a/app/observatory/multiObservatory/muti.go b/app/observatory/multiObservatory/muti.go new file mode 100644 index 000000000..9131dd613 --- /dev/null +++ b/app/observatory/multiObservatory/muti.go @@ -0,0 +1,38 @@ +package multiObservatory + +import ( + "context" + "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/common/taggedfeatures" + "github.com/v2fly/v2ray-core/v4/features" + "github.com/v2fly/v2ray-core/v4/features/extension" +) + +type Observer struct { + features.TaggedFeatures + config *Config + ctx context.Context +} + +func (o Observer) GetObservation(ctx context.Context) (proto.Message, error) { + return common.Must2(o.GetFeaturesByTag("")).(extension.Observatory).GetObservation(ctx) +} + +func (o Observer) Type() interface{} { + return extension.ObservatoryType() +} + +func New(ctx context.Context, config *Config) (*Observer, error) { + holder, err := taggedfeatures.NewHolderFromConfig(ctx, config.Holders, extension.ObservatoryType()) + if err != nil { + return nil, err + } + return &Observer{config: config, ctx: ctx, TaggedFeatures: holder}, nil +} + +func init() { + common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) { + return New(ctx, config.(*Config)) + })) +}