From bbb24a66d12a696bd23adfa8c6e92674db68da1b Mon Sep 17 00:00:00 2001 From: SaintShit Date: Sun, 19 May 2024 12:37:44 +0330 Subject: [PATCH] fix: update xray_api proto files to Xray-core v1.8.11 --- xray_api/proto/app/dns/config_pb2.py | 32 ++-- .../proto/app/observatory/burst/config_pb2.py | 45 ++++++ .../app/observatory/burst/config_pb2_grpc.py | 4 + xray_api/proto/app/observatory/config_pb2.py | 28 ++-- xray_api/proto/app/proxyman/config_pb2.py | 12 +- .../proto/app/router/command/command_pb2.py | 137 ++++++++++++++++-- .../app/router/command/command_pb2_grpc.py | 132 +++++++++++++++++ xray_api/proto/app/router/config_pb2.py | 84 +++++++---- xray_api/proto/common/protocol/headers_pb2.py | 5 +- xray_api/proto/proxy/dns/config_pb2.py | 4 +- xray_api/proto/proxy/freedom/config_pb2.py | 20 ++- xray_api/proto/proxy/http/config_pb2.py | 16 +- .../proxy/shadowsocks_2022/config_pb2.py | 6 +- xray_api/proto/proxy/trojan/config_pb2.py | 16 +- xray_api/proto/proxy/vmess/account_pb2.py | 4 +- .../proto/proxy/vmess/inbound/config_pb2.py | 8 +- xray_api/proto/proxy/wireguard/config_pb2.py | 48 ++++++ .../proto/proxy/wireguard/config_pb2_grpc.py | 4 + .../proto/transport/internet/config_pb2.py | 24 ++- .../transport/internet/grpc/config_pb2.py | 4 +- .../internet/headers/dns/config_pb2.py | 35 +++++ .../internet/headers/dns/config_pb2_grpc.py | 4 + .../internet/httpupgrade/config_pb2.py | 48 ++++++ .../internet/httpupgrade/config_pb2_grpc.py | 4 + .../transport/internet/reality/config_pb2.py | 35 +++++ .../internet/reality/config_pb2_grpc.py | 4 + .../transport/internet/tls/config_pb2.py | 6 +- .../internet/websocket/config_pb2.py | 29 ++-- xray_api/types/account.py | 4 +- 29 files changed, 676 insertions(+), 126 deletions(-) create mode 100644 xray_api/proto/app/observatory/burst/config_pb2.py create mode 100644 xray_api/proto/app/observatory/burst/config_pb2_grpc.py create mode 100644 xray_api/proto/proxy/wireguard/config_pb2.py create mode 100644 xray_api/proto/proxy/wireguard/config_pb2_grpc.py create mode 100644 xray_api/proto/transport/internet/headers/dns/config_pb2.py create mode 100644 xray_api/proto/transport/internet/headers/dns/config_pb2_grpc.py create mode 100644 xray_api/proto/transport/internet/httpupgrade/config_pb2.py create mode 100644 xray_api/proto/transport/internet/httpupgrade/config_pb2_grpc.py create mode 100644 xray_api/proto/transport/internet/reality/config_pb2.py create mode 100644 xray_api/proto/transport/internet/reality/config_pb2_grpc.py diff --git a/xray_api/proto/app/dns/config_pb2.py b/xray_api/proto/app/dns/config_pb2.py index 9966067c..8379fd91 100644 --- a/xray_api/proto/app/dns/config_pb2.py +++ b/xray_api/proto/app/dns/config_pb2.py @@ -18,7 +18,7 @@ from xray_api.proto.app.router import config_pb2 as app_dot_router_dot_config__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x61pp/dns/config.proto\x12\x0cxray.app.dns\x1a\x18\x63ommon/net/address.proto\x1a\x1c\x63ommon/net/destination.proto\x1a\x17\x61pp/router/config.proto\"\x8a\x03\n\nNameServer\x12*\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x19.xray.common.net.Endpoint\x12\x11\n\tclient_ip\x18\x05 \x01(\x0c\x12\x14\n\x0cskipFallback\x18\x06 \x01(\x08\x12\x43\n\x12prioritized_domain\x18\x02 \x03(\x0b\x32\'.xray.app.dns.NameServer.PriorityDomain\x12%\n\x05geoip\x18\x03 \x03(\x0b\x32\x16.xray.app.router.GeoIP\x12=\n\x0eoriginal_rules\x18\x04 \x03(\x0b\x32%.xray.app.dns.NameServer.OriginalRule\x1aP\n\x0ePriorityDomain\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .xray.app.dns.DomainMatchingType\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x1a*\n\x0cOriginalRule\x12\x0c\n\x04rule\x18\x01 \x01(\t\x12\x0c\n\x04size\x18\x02 \x01(\r\"\xbf\x04\n\x06\x43onfig\x12\x32\n\x0bNameServers\x18\x01 \x03(\x0b\x32\x19.xray.common.net.EndpointB\x02\x18\x01\x12-\n\x0bname_server\x18\x05 \x03(\x0b\x32\x18.xray.app.dns.NameServer\x12\x32\n\x05Hosts\x18\x02 \x03(\x0b\x32\x1f.xray.app.dns.Config.HostsEntryB\x02\x18\x01\x12\x11\n\tclient_ip\x18\x03 \x01(\x0c\x12\x36\n\x0cstatic_hosts\x18\x04 \x03(\x0b\x32 .xray.app.dns.Config.HostMapping\x12\x0b\n\x03tag\x18\x06 \x01(\t\x12\x14\n\x0c\x64isableCache\x18\x08 \x01(\x08\x12\x33\n\x0equery_strategy\x18\t \x01(\x0e\x32\x1b.xray.app.dns.QueryStrategy\x12\x17\n\x0f\x64isableFallback\x18\n \x01(\x08\x12\x1e\n\x16\x64isableFallbackIfMatch\x18\x0b \x01(\x08\x1aI\n\nHostsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain:\x02\x38\x01\x1aq\n\x0bHostMapping\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .xray.app.dns.DomainMatchingType\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x12\n\n\x02ip\x18\x03 \x03(\x0c\x12\x16\n\x0eproxied_domain\x18\x04 \x01(\tJ\x04\x08\x07\x10\x08*E\n\x12\x44omainMatchingType\x12\x08\n\x04\x46ull\x10\x00\x12\r\n\tSubdomain\x10\x01\x12\x0b\n\x07Keyword\x10\x02\x12\t\n\x05Regex\x10\x03*5\n\rQueryStrategy\x12\n\n\x06USE_IP\x10\x00\x12\x0b\n\x07USE_IP4\x10\x01\x12\x0b\n\x07USE_IP6\x10\x02\x42\x46\n\x10\x63om.xray.app.dnsP\x01Z!github.com/xtls/xray-core/app/dns\xaa\x02\x0cXray.App.Dnsb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x61pp/dns/config.proto\x12\x0cxray.app.dns\x1a\x18\x63ommon/net/address.proto\x1a\x1c\x63ommon/net/destination.proto\x1a\x17\x61pp/router/config.proto\"\xbf\x03\n\nNameServer\x12*\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x19.xray.common.net.Endpoint\x12\x11\n\tclient_ip\x18\x05 \x01(\x0c\x12\x14\n\x0cskipFallback\x18\x06 \x01(\x08\x12\x43\n\x12prioritized_domain\x18\x02 \x03(\x0b\x32\'.xray.app.dns.NameServer.PriorityDomain\x12%\n\x05geoip\x18\x03 \x03(\x0b\x32\x16.xray.app.router.GeoIP\x12=\n\x0eoriginal_rules\x18\x04 \x03(\x0b\x32%.xray.app.dns.NameServer.OriginalRule\x12\x33\n\x0equery_strategy\x18\x07 \x01(\x0e\x32\x1b.xray.app.dns.QueryStrategy\x1aP\n\x0ePriorityDomain\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .xray.app.dns.DomainMatchingType\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x1a*\n\x0cOriginalRule\x12\x0c\n\x04rule\x18\x01 \x01(\t\x12\x0c\n\x04size\x18\x02 \x01(\r\"\xbf\x04\n\x06\x43onfig\x12\x32\n\x0bNameServers\x18\x01 \x03(\x0b\x32\x19.xray.common.net.EndpointB\x02\x18\x01\x12-\n\x0bname_server\x18\x05 \x03(\x0b\x32\x18.xray.app.dns.NameServer\x12\x32\n\x05Hosts\x18\x02 \x03(\x0b\x32\x1f.xray.app.dns.Config.HostsEntryB\x02\x18\x01\x12\x11\n\tclient_ip\x18\x03 \x01(\x0c\x12\x36\n\x0cstatic_hosts\x18\x04 \x03(\x0b\x32 .xray.app.dns.Config.HostMapping\x12\x0b\n\x03tag\x18\x06 \x01(\t\x12\x14\n\x0c\x64isableCache\x18\x08 \x01(\x08\x12\x33\n\x0equery_strategy\x18\t \x01(\x0e\x32\x1b.xray.app.dns.QueryStrategy\x12\x17\n\x0f\x64isableFallback\x18\n \x01(\x08\x12\x1e\n\x16\x64isableFallbackIfMatch\x18\x0b \x01(\x08\x1aI\n\nHostsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12*\n\x05value\x18\x02 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain:\x02\x38\x01\x1aq\n\x0bHostMapping\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .xray.app.dns.DomainMatchingType\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x12\n\n\x02ip\x18\x03 \x03(\x0c\x12\x16\n\x0eproxied_domain\x18\x04 \x01(\tJ\x04\x08\x07\x10\x08*E\n\x12\x44omainMatchingType\x12\x08\n\x04\x46ull\x10\x00\x12\r\n\tSubdomain\x10\x01\x12\x0b\n\x07Keyword\x10\x02\x12\t\n\x05Regex\x10\x03*5\n\rQueryStrategy\x12\n\n\x06USE_IP\x10\x00\x12\x0b\n\x07USE_IP4\x10\x01\x12\x0b\n\x07USE_IP6\x10\x02\x42\x46\n\x10\x63om.xray.app.dnsP\x01Z!github.com/xtls/xray-core/app/dns\xaa\x02\x0cXray.App.Dnsb\x06proto3') _DOMAINMATCHINGTYPE = DESCRIPTOR.enum_types_by_name['DomainMatchingType'] DomainMatchingType = enum_type_wrapper.EnumTypeWrapper(_DOMAINMATCHINGTYPE) @@ -95,20 +95,20 @@ _CONFIG.fields_by_name['NameServers']._serialized_options = b'\030\001' _CONFIG.fields_by_name['Hosts']._options = None _CONFIG.fields_by_name['Hosts']._serialized_options = b'\030\001' - _DOMAINMATCHINGTYPE._serialized_start=1094 - _DOMAINMATCHINGTYPE._serialized_end=1163 - _QUERYSTRATEGY._serialized_start=1165 - _QUERYSTRATEGY._serialized_end=1218 + _DOMAINMATCHINGTYPE._serialized_start=1147 + _DOMAINMATCHINGTYPE._serialized_end=1216 + _QUERYSTRATEGY._serialized_start=1218 + _QUERYSTRATEGY._serialized_end=1271 _NAMESERVER._serialized_start=120 - _NAMESERVER._serialized_end=514 - _NAMESERVER_PRIORITYDOMAIN._serialized_start=390 - _NAMESERVER_PRIORITYDOMAIN._serialized_end=470 - _NAMESERVER_ORIGINALRULE._serialized_start=472 - _NAMESERVER_ORIGINALRULE._serialized_end=514 - _CONFIG._serialized_start=517 - _CONFIG._serialized_end=1092 - _CONFIG_HOSTSENTRY._serialized_start=898 - _CONFIG_HOSTSENTRY._serialized_end=971 - _CONFIG_HOSTMAPPING._serialized_start=973 - _CONFIG_HOSTMAPPING._serialized_end=1086 + _NAMESERVER._serialized_end=567 + _NAMESERVER_PRIORITYDOMAIN._serialized_start=443 + _NAMESERVER_PRIORITYDOMAIN._serialized_end=523 + _NAMESERVER_ORIGINALRULE._serialized_start=525 + _NAMESERVER_ORIGINALRULE._serialized_end=567 + _CONFIG._serialized_start=570 + _CONFIG._serialized_end=1145 + _CONFIG_HOSTSENTRY._serialized_start=951 + _CONFIG_HOSTSENTRY._serialized_end=1024 + _CONFIG_HOSTMAPPING._serialized_start=1026 + _CONFIG_HOSTMAPPING._serialized_end=1139 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/app/observatory/burst/config_pb2.py b/xray_api/proto/app/observatory/burst/config_pb2.py new file mode 100644 index 00000000..67e3d699 --- /dev/null +++ b/xray_api/proto/app/observatory/burst/config_pb2.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: app/observatory/burst/config.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"app/observatory/burst/config.proto\x12\x1fxray.core.app.observatory.burst\"j\n\x06\x43onfig\x12\x18\n\x10subject_selector\x18\x02 \x03(\t\x12\x46\n\x0bping_config\x18\x03 \x01(\x0b\x32\x31.xray.core.app.observatory.burst.HealthPingConfig\"w\n\x10HealthPingConfig\x12\x13\n\x0b\x64\x65stination\x18\x01 \x01(\t\x12\x14\n\x0c\x63onnectivity\x18\x02 \x01(\t\x12\x10\n\x08interval\x18\x03 \x01(\x03\x12\x15\n\rsamplingCount\x18\x04 \x01(\x05\x12\x0f\n\x07timeout\x18\x05 \x01(\x03\x42p\n\x1e\x63om.xray.app.observatory.burstP\x01Z/github.com/xtls/xray-core/app/observatory/burst\xaa\x02\x1aXray.App.Observatory.Burstb\x06proto3') + + + +_CONFIG = DESCRIPTOR.message_types_by_name['Config'] +_HEALTHPINGCONFIG = DESCRIPTOR.message_types_by_name['HealthPingConfig'] +Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { + 'DESCRIPTOR' : _CONFIG, + '__module__' : 'app.observatory.burst.config_pb2' + # @@protoc_insertion_point(class_scope:xray.core.app.observatory.burst.Config) + }) +_sym_db.RegisterMessage(Config) + +HealthPingConfig = _reflection.GeneratedProtocolMessageType('HealthPingConfig', (_message.Message,), { + 'DESCRIPTOR' : _HEALTHPINGCONFIG, + '__module__' : 'app.observatory.burst.config_pb2' + # @@protoc_insertion_point(class_scope:xray.core.app.observatory.burst.HealthPingConfig) + }) +_sym_db.RegisterMessage(HealthPingConfig) + +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\036com.xray.app.observatory.burstP\001Z/github.com/xtls/xray-core/app/observatory/burst\252\002\032Xray.App.Observatory.Burst' + _CONFIG._serialized_start=71 + _CONFIG._serialized_end=177 + _HEALTHPINGCONFIG._serialized_start=179 + _HEALTHPINGCONFIG._serialized_end=298 +# @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/app/observatory/burst/config_pb2_grpc.py b/xray_api/proto/app/observatory/burst/config_pb2_grpc.py new file mode 100644 index 00000000..2daafffe --- /dev/null +++ b/xray_api/proto/app/observatory/burst/config_pb2_grpc.py @@ -0,0 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + diff --git a/xray_api/proto/app/observatory/config_pb2.py b/xray_api/proto/app/observatory/config_pb2.py index 65191a6a..a5824858 100644 --- a/xray_api/proto/app/observatory/config_pb2.py +++ b/xray_api/proto/app/observatory/config_pb2.py @@ -14,11 +14,12 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x61pp/observatory/config.proto\x12\x19xray.core.app.observatory\"N\n\x11ObservationResult\x12\x39\n\x06status\x18\x01 \x03(\x0b\x32).xray.core.app.observatory.OutboundStatus\"\x8e\x01\n\x0eOutboundStatus\x12\r\n\x05\x61live\x18\x01 \x01(\x08\x12\r\n\x05\x64\x65lay\x18\x02 \x01(\x03\x12\x19\n\x11last_error_reason\x18\x03 \x01(\t\x12\x14\n\x0coutbound_tag\x18\x04 \x01(\t\x12\x16\n\x0elast_seen_time\x18\x05 \x01(\x03\x12\x15\n\rlast_try_time\x18\x06 \x01(\x03\"F\n\x0bProbeResult\x12\r\n\x05\x61live\x18\x01 \x01(\x08\x12\r\n\x05\x64\x65lay\x18\x02 \x01(\x03\x12\x19\n\x11last_error_reason\x18\x03 \x01(\t\"#\n\tIntensity\x12\x16\n\x0eprobe_interval\x18\x01 \x01(\r\"i\n\x06\x43onfig\x12\x18\n\x10subject_selector\x18\x02 \x03(\t\x12\x11\n\tprobe_url\x18\x03 \x01(\t\x12\x16\n\x0eprobe_interval\x18\x04 \x01(\x03\x12\x1a\n\x12\x65nable_concurrency\x18\x05 \x01(\x08\x42^\n\x18\x63om.xray.app.observatoryP\x01Z)github.com/xtls/xray-core/app/observatory\xaa\x02\x14Xray.App.Observatoryb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x61pp/observatory/config.proto\x12\x19xray.core.app.observatory\"N\n\x11ObservationResult\x12\x39\n\x06status\x18\x01 \x03(\x0b\x32).xray.core.app.observatory.OutboundStatus\"v\n\x1bHealthPingMeasurementResult\x12\x0b\n\x03\x61ll\x18\x01 \x01(\x03\x12\x0c\n\x04\x66\x61il\x18\x02 \x01(\x03\x12\x11\n\tdeviation\x18\x03 \x01(\x03\x12\x0f\n\x07\x61verage\x18\x04 \x01(\x03\x12\x0b\n\x03max\x18\x05 \x01(\x03\x12\x0b\n\x03min\x18\x06 \x01(\x03\"\xdb\x01\n\x0eOutboundStatus\x12\r\n\x05\x61live\x18\x01 \x01(\x08\x12\r\n\x05\x64\x65lay\x18\x02 \x01(\x03\x12\x19\n\x11last_error_reason\x18\x03 \x01(\t\x12\x14\n\x0coutbound_tag\x18\x04 \x01(\t\x12\x16\n\x0elast_seen_time\x18\x05 \x01(\x03\x12\x15\n\rlast_try_time\x18\x06 \x01(\x03\x12K\n\x0bhealth_ping\x18\x07 \x01(\x0b\x32\x36.xray.core.app.observatory.HealthPingMeasurementResult\"F\n\x0bProbeResult\x12\r\n\x05\x61live\x18\x01 \x01(\x08\x12\r\n\x05\x64\x65lay\x18\x02 \x01(\x03\x12\x19\n\x11last_error_reason\x18\x03 \x01(\t\"#\n\tIntensity\x12\x16\n\x0eprobe_interval\x18\x01 \x01(\r\"i\n\x06\x43onfig\x12\x18\n\x10subject_selector\x18\x02 \x03(\t\x12\x11\n\tprobe_url\x18\x03 \x01(\t\x12\x16\n\x0eprobe_interval\x18\x04 \x01(\x03\x12\x1a\n\x12\x65nable_concurrency\x18\x05 \x01(\x08\x42^\n\x18\x63om.xray.app.observatoryP\x01Z)github.com/xtls/xray-core/app/observatory\xaa\x02\x14Xray.App.Observatoryb\x06proto3') _OBSERVATIONRESULT = DESCRIPTOR.message_types_by_name['ObservationResult'] +_HEALTHPINGMEASUREMENTRESULT = DESCRIPTOR.message_types_by_name['HealthPingMeasurementResult'] _OUTBOUNDSTATUS = DESCRIPTOR.message_types_by_name['OutboundStatus'] _PROBERESULT = DESCRIPTOR.message_types_by_name['ProbeResult'] _INTENSITY = DESCRIPTOR.message_types_by_name['Intensity'] @@ -30,6 +31,13 @@ }) _sym_db.RegisterMessage(ObservationResult) +HealthPingMeasurementResult = _reflection.GeneratedProtocolMessageType('HealthPingMeasurementResult', (_message.Message,), { + 'DESCRIPTOR' : _HEALTHPINGMEASUREMENTRESULT, + '__module__' : 'app.observatory.config_pb2' + # @@protoc_insertion_point(class_scope:xray.core.app.observatory.HealthPingMeasurementResult) + }) +_sym_db.RegisterMessage(HealthPingMeasurementResult) + OutboundStatus = _reflection.GeneratedProtocolMessageType('OutboundStatus', (_message.Message,), { 'DESCRIPTOR' : _OUTBOUNDSTATUS, '__module__' : 'app.observatory.config_pb2' @@ -64,12 +72,14 @@ DESCRIPTOR._serialized_options = b'\n\030com.xray.app.observatoryP\001Z)github.com/xtls/xray-core/app/observatory\252\002\024Xray.App.Observatory' _OBSERVATIONRESULT._serialized_start=59 _OBSERVATIONRESULT._serialized_end=137 - _OUTBOUNDSTATUS._serialized_start=140 - _OUTBOUNDSTATUS._serialized_end=282 - _PROBERESULT._serialized_start=284 - _PROBERESULT._serialized_end=354 - _INTENSITY._serialized_start=356 - _INTENSITY._serialized_end=391 - _CONFIG._serialized_start=393 - _CONFIG._serialized_end=498 + _HEALTHPINGMEASUREMENTRESULT._serialized_start=139 + _HEALTHPINGMEASUREMENTRESULT._serialized_end=257 + _OUTBOUNDSTATUS._serialized_start=260 + _OUTBOUNDSTATUS._serialized_end=479 + _PROBERESULT._serialized_start=481 + _PROBERESULT._serialized_end=551 + _INTENSITY._serialized_start=553 + _INTENSITY._serialized_end=588 + _CONFIG._serialized_start=590 + _CONFIG._serialized_end=695 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/app/proxyman/config_pb2.py b/xray_api/proto/app/proxyman/config_pb2.py index eeda6640..c1db1014 100644 --- a/xray_api/proto/app/proxyman/config_pb2.py +++ b/xray_api/proto/app/proxyman/config_pb2.py @@ -19,7 +19,7 @@ from xray_api.proto.common.serial import typed_message_pb2 as common_dot_serial_dot_typed__message__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x61pp/proxyman/config.proto\x12\x11xray.app.proxyman\x1a\x18\x63ommon/net/address.proto\x1a\x15\x63ommon/net/port.proto\x1a\x1ftransport/internet/config.proto\x1a!common/serial/typed_message.proto\"\x0f\n\rInboundConfig\"\x84\x03\n\x12\x41llocationStrategy\x12\x38\n\x04type\x18\x01 \x01(\x0e\x32*.xray.app.proxyman.AllocationStrategy.Type\x12X\n\x0b\x63oncurrency\x18\x02 \x01(\x0b\x32\x43.xray.app.proxyman.AllocationStrategy.AllocationStrategyConcurrency\x12P\n\x07refresh\x18\x03 \x01(\x0b\x32?.xray.app.proxyman.AllocationStrategy.AllocationStrategyRefresh\x1a.\n\x1d\x41llocationStrategyConcurrency\x12\r\n\x05value\x18\x01 \x01(\r\x1a*\n\x19\x41llocationStrategyRefresh\x12\r\n\x05value\x18\x01 \x01(\r\",\n\x04Type\x12\n\n\x06\x41lways\x10\x00\x12\n\n\x06Random\x10\x01\x12\x0c\n\x08\x45xternal\x10\x02\"\x84\x01\n\x0eSniffingConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x1c\n\x14\x64\x65stination_override\x18\x02 \x03(\t\x12\x18\n\x10\x64omains_excluded\x18\x03 \x03(\t\x12\x15\n\rmetadata_only\x18\x04 \x01(\x08\x12\x12\n\nroute_only\x18\x05 \x01(\x08\"\x99\x03\n\x0eReceiverConfig\x12,\n\tport_list\x18\x01 \x01(\x0b\x32\x19.xray.common.net.PortList\x12+\n\x06listen\x18\x02 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12\x42\n\x13\x61llocation_strategy\x18\x03 \x01(\x0b\x32%.xray.app.proxyman.AllocationStrategy\x12>\n\x0fstream_settings\x18\x04 \x01(\x0b\x32%.xray.transport.internet.StreamConfig\x12$\n\x1creceive_original_destination\x18\x05 \x01(\x08\x12>\n\x0f\x64omain_override\x18\x07 \x03(\x0e\x32!.xray.app.proxyman.KnownProtocolsB\x02\x18\x01\x12<\n\x11sniffing_settings\x18\x08 \x01(\x0b\x32!.xray.app.proxyman.SniffingConfigJ\x04\x08\x06\x10\x07\"\x9a\x01\n\x14InboundHandlerConfig\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12;\n\x11receiver_settings\x18\x02 \x01(\x0b\x32 .xray.common.serial.TypedMessage\x12\x38\n\x0eproxy_settings\x18\x03 \x01(\x0b\x32 .xray.common.serial.TypedMessage\"\x10\n\x0eOutboundConfig\"\xf9\x01\n\x0cSenderConfig\x12(\n\x03via\x18\x01 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12>\n\x0fstream_settings\x18\x02 \x01(\x0b\x32%.xray.transport.internet.StreamConfig\x12<\n\x0eproxy_settings\x18\x03 \x01(\x0b\x32$.xray.transport.internet.ProxyConfig\x12\x41\n\x12multiplex_settings\x18\x04 \x01(\x0b\x32%.xray.app.proxyman.MultiplexingConfig\":\n\x12MultiplexingConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x13\n\x0b\x63oncurrency\x18\x02 \x01(\r*#\n\x0eKnownProtocols\x12\x08\n\x04HTTP\x10\x00\x12\x07\n\x03TLS\x10\x01\x42U\n\x15\x63om.xray.app.proxymanP\x01Z&github.com/xtls/xray-core/app/proxyman\xaa\x02\x11Xray.App.Proxymanb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x61pp/proxyman/config.proto\x12\x11xray.app.proxyman\x1a\x18\x63ommon/net/address.proto\x1a\x15\x63ommon/net/port.proto\x1a\x1ftransport/internet/config.proto\x1a!common/serial/typed_message.proto\"\x0f\n\rInboundConfig\"\x84\x03\n\x12\x41llocationStrategy\x12\x38\n\x04type\x18\x01 \x01(\x0e\x32*.xray.app.proxyman.AllocationStrategy.Type\x12X\n\x0b\x63oncurrency\x18\x02 \x01(\x0b\x32\x43.xray.app.proxyman.AllocationStrategy.AllocationStrategyConcurrency\x12P\n\x07refresh\x18\x03 \x01(\x0b\x32?.xray.app.proxyman.AllocationStrategy.AllocationStrategyRefresh\x1a.\n\x1d\x41llocationStrategyConcurrency\x12\r\n\x05value\x18\x01 \x01(\r\x1a*\n\x19\x41llocationStrategyRefresh\x12\r\n\x05value\x18\x01 \x01(\r\",\n\x04Type\x12\n\n\x06\x41lways\x10\x00\x12\n\n\x06Random\x10\x01\x12\x0c\n\x08\x45xternal\x10\x02\"\x84\x01\n\x0eSniffingConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x1c\n\x14\x64\x65stination_override\x18\x02 \x03(\t\x12\x18\n\x10\x64omains_excluded\x18\x03 \x03(\t\x12\x15\n\rmetadata_only\x18\x04 \x01(\x08\x12\x12\n\nroute_only\x18\x05 \x01(\x08\"\x99\x03\n\x0eReceiverConfig\x12,\n\tport_list\x18\x01 \x01(\x0b\x32\x19.xray.common.net.PortList\x12+\n\x06listen\x18\x02 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12\x42\n\x13\x61llocation_strategy\x18\x03 \x01(\x0b\x32%.xray.app.proxyman.AllocationStrategy\x12>\n\x0fstream_settings\x18\x04 \x01(\x0b\x32%.xray.transport.internet.StreamConfig\x12$\n\x1creceive_original_destination\x18\x05 \x01(\x08\x12>\n\x0f\x64omain_override\x18\x07 \x03(\x0e\x32!.xray.app.proxyman.KnownProtocolsB\x02\x18\x01\x12<\n\x11sniffing_settings\x18\x08 \x01(\x0b\x32!.xray.app.proxyman.SniffingConfigJ\x04\x08\x06\x10\x07\"\x9a\x01\n\x14InboundHandlerConfig\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12;\n\x11receiver_settings\x18\x02 \x01(\x0b\x32 .xray.common.serial.TypedMessage\x12\x38\n\x0eproxy_settings\x18\x03 \x01(\x0b\x32 .xray.common.serial.TypedMessage\"\x10\n\x0eOutboundConfig\"\x8b\x02\n\x0cSenderConfig\x12(\n\x03via\x18\x01 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12>\n\x0fstream_settings\x18\x02 \x01(\x0b\x32%.xray.transport.internet.StreamConfig\x12<\n\x0eproxy_settings\x18\x03 \x01(\x0b\x32$.xray.transport.internet.ProxyConfig\x12\x41\n\x12multiplex_settings\x18\x04 \x01(\x0b\x32%.xray.app.proxyman.MultiplexingConfig\x12\x10\n\x08via_cidr\x18\x05 \x01(\t\"l\n\x12MultiplexingConfig\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\x12\x13\n\x0b\x63oncurrency\x18\x02 \x01(\x05\x12\x17\n\x0fxudpConcurrency\x18\x03 \x01(\x05\x12\x17\n\x0fxudpProxyUDP443\x18\x04 \x01(\t*#\n\x0eKnownProtocols\x12\x08\n\x04HTTP\x10\x00\x12\x07\n\x03TLS\x10\x01\x42U\n\x15\x63om.xray.app.proxymanP\x01Z&github.com/xtls/xray-core/app/proxyman\xaa\x02\x11Xray.App.Proxymanb\x06proto3') _KNOWNPROTOCOLS = DESCRIPTOR.enum_types_by_name['KnownProtocols'] KnownProtocols = enum_type_wrapper.EnumTypeWrapper(_KNOWNPROTOCOLS) @@ -116,8 +116,8 @@ DESCRIPTOR._serialized_options = b'\n\025com.xray.app.proxymanP\001Z&github.com/xtls/xray-core/app/proxyman\252\002\021Xray.App.Proxyman' _RECEIVERCONFIG.fields_by_name['domain_override']._options = None _RECEIVERCONFIG.fields_by_name['domain_override']._serialized_options = b'\030\001' - _KNOWNPROTOCOLS._serialized_start=1607 - _KNOWNPROTOCOLS._serialized_end=1642 + _KNOWNPROTOCOLS._serialized_start=1675 + _KNOWNPROTOCOLS._serialized_end=1710 _INBOUNDCONFIG._serialized_start=165 _INBOUNDCONFIG._serialized_end=180 _ALLOCATIONSTRATEGY._serialized_start=183 @@ -137,7 +137,7 @@ _OUTBOUNDCONFIG._serialized_start=1277 _OUTBOUNDCONFIG._serialized_end=1293 _SENDERCONFIG._serialized_start=1296 - _SENDERCONFIG._serialized_end=1545 - _MULTIPLEXINGCONFIG._serialized_start=1547 - _MULTIPLEXINGCONFIG._serialized_end=1605 + _SENDERCONFIG._serialized_end=1563 + _MULTIPLEXINGCONFIG._serialized_start=1565 + _MULTIPLEXINGCONFIG._serialized_end=1673 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/app/router/command/command_pb2.py b/xray_api/proto/app/router/command/command_pb2.py index 4102cc79..0c95f5ad 100644 --- a/xray_api/proto/app/router/command/command_pb2.py +++ b/xray_api/proto/app/router/command/command_pb2.py @@ -13,9 +13,10 @@ from xray_api.proto.common.net import network_pb2 as common_dot_net_dot_network__pb2 +from xray_api.proto.common.serial import typed_message_pb2 as common_dot_serial_dot_typed__message__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n app/router/command/command.proto\x12\x17xray.app.router.command\x1a\x18\x63ommon/net/network.proto\"\x83\x03\n\x0eRoutingContext\x12\x12\n\nInboundTag\x18\x01 \x01(\t\x12)\n\x07Network\x18\x02 \x01(\x0e\x32\x18.xray.common.net.Network\x12\x11\n\tSourceIPs\x18\x03 \x03(\x0c\x12\x11\n\tTargetIPs\x18\x04 \x03(\x0c\x12\x12\n\nSourcePort\x18\x05 \x01(\r\x12\x12\n\nTargetPort\x18\x06 \x01(\r\x12\x14\n\x0cTargetDomain\x18\x07 \x01(\t\x12\x10\n\x08Protocol\x18\x08 \x01(\t\x12\x0c\n\x04User\x18\t \x01(\t\x12K\n\nAttributes\x18\n \x03(\x0b\x32\x37.xray.app.router.command.RoutingContext.AttributesEntry\x12\x19\n\x11OutboundGroupTags\x18\x0b \x03(\t\x12\x13\n\x0bOutboundTag\x18\x0c \x01(\t\x1a\x31\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"6\n\x1cSubscribeRoutingStatsRequest\x12\x16\n\x0e\x46ieldSelectors\x18\x01 \x03(\t\"\x82\x01\n\x10TestRouteRequest\x12?\n\x0eRoutingContext\x18\x01 \x01(\x0b\x32\'.xray.app.router.command.RoutingContext\x12\x16\n\x0e\x46ieldSelectors\x18\x02 \x03(\t\x12\x15\n\rPublishResult\x18\x03 \x01(\x08\"\x08\n\x06\x43onfig2\xf0\x01\n\x0eRoutingService\x12{\n\x15SubscribeRoutingStats\x12\x35.xray.app.router.command.SubscribeRoutingStatsRequest\x1a\'.xray.app.router.command.RoutingContext\"\x00\x30\x01\x12\x61\n\tTestRoute\x12).xray.app.router.command.TestRouteRequest\x1a\'.xray.app.router.command.RoutingContext\"\x00\x42g\n\x1b\x63om.xray.app.router.commandP\x01Z,github.com/xtls/xray-core/app/router/command\xaa\x02\x17Xray.App.Router.Commandb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n app/router/command/command.proto\x12\x17xray.app.router.command\x1a\x18\x63ommon/net/network.proto\x1a!common/serial/typed_message.proto\"\x83\x03\n\x0eRoutingContext\x12\x12\n\nInboundTag\x18\x01 \x01(\t\x12)\n\x07Network\x18\x02 \x01(\x0e\x32\x18.xray.common.net.Network\x12\x11\n\tSourceIPs\x18\x03 \x03(\x0c\x12\x11\n\tTargetIPs\x18\x04 \x03(\x0c\x12\x12\n\nSourcePort\x18\x05 \x01(\r\x12\x12\n\nTargetPort\x18\x06 \x01(\r\x12\x14\n\x0cTargetDomain\x18\x07 \x01(\t\x12\x10\n\x08Protocol\x18\x08 \x01(\t\x12\x0c\n\x04User\x18\t \x01(\t\x12K\n\nAttributes\x18\n \x03(\x0b\x32\x37.xray.app.router.command.RoutingContext.AttributesEntry\x12\x19\n\x11OutboundGroupTags\x18\x0b \x03(\t\x12\x13\n\x0bOutboundTag\x18\x0c \x01(\t\x1a\x31\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"6\n\x1cSubscribeRoutingStatsRequest\x12\x16\n\x0e\x46ieldSelectors\x18\x01 \x03(\t\"\x82\x01\n\x10TestRouteRequest\x12?\n\x0eRoutingContext\x18\x01 \x01(\x0b\x32\'.xray.app.router.command.RoutingContext\x12\x16\n\x0e\x46ieldSelectors\x18\x02 \x03(\t\x12\x15\n\rPublishResult\x18\x03 \x01(\x08\"\"\n\x13PrincipleTargetInfo\x12\x0b\n\x03tag\x18\x01 \x03(\t\"\x1e\n\x0cOverrideInfo\x12\x0e\n\x06target\x18\x02 \x01(\t\"\x8e\x01\n\x0b\x42\x61lancerMsg\x12\x37\n\x08override\x18\x05 \x01(\x0b\x32%.xray.app.router.command.OverrideInfo\x12\x46\n\x10principle_target\x18\x06 \x01(\x0b\x32,.xray.app.router.command.PrincipleTargetInfo\"%\n\x16GetBalancerInfoRequest\x12\x0b\n\x03tag\x18\x01 \x01(\t\"Q\n\x17GetBalancerInfoResponse\x12\x36\n\x08\x62\x61lancer\x18\x01 \x01(\x0b\x32$.xray.app.router.command.BalancerMsg\"D\n\x1dOverrideBalancerTargetRequest\x12\x13\n\x0b\x62\x61lancerTag\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\" \n\x1eOverrideBalancerTargetResponse\"X\n\x0e\x41\x64\x64RuleRequest\x12\x30\n\x06\x63onfig\x18\x01 \x01(\x0b\x32 .xray.common.serial.TypedMessage\x12\x14\n\x0cshouldAppend\x18\x02 \x01(\x08\"\x11\n\x0f\x41\x64\x64RuleResponse\"$\n\x11RemoveRuleRequest\x12\x0f\n\x07ruleTag\x18\x01 \x01(\t\"\x14\n\x12RemoveRuleResponse\"\x08\n\x06\x43onfig2\xbf\x05\n\x0eRoutingService\x12{\n\x15SubscribeRoutingStats\x12\x35.xray.app.router.command.SubscribeRoutingStatsRequest\x1a\'.xray.app.router.command.RoutingContext\"\x00\x30\x01\x12\x61\n\tTestRoute\x12).xray.app.router.command.TestRouteRequest\x1a\'.xray.app.router.command.RoutingContext\"\x00\x12v\n\x0fGetBalancerInfo\x12/.xray.app.router.command.GetBalancerInfoRequest\x1a\x30.xray.app.router.command.GetBalancerInfoResponse\"\x00\x12\x8b\x01\n\x16OverrideBalancerTarget\x12\x36.xray.app.router.command.OverrideBalancerTargetRequest\x1a\x37.xray.app.router.command.OverrideBalancerTargetResponse\"\x00\x12^\n\x07\x41\x64\x64Rule\x12\'.xray.app.router.command.AddRuleRequest\x1a(.xray.app.router.command.AddRuleResponse\"\x00\x12g\n\nRemoveRule\x12*.xray.app.router.command.RemoveRuleRequest\x1a+.xray.app.router.command.RemoveRuleResponse\"\x00\x42g\n\x1b\x63om.xray.app.router.commandP\x01Z,github.com/xtls/xray-core/app/router/command\xaa\x02\x17Xray.App.Router.Commandb\x06proto3') @@ -23,6 +24,17 @@ _ROUTINGCONTEXT_ATTRIBUTESENTRY = _ROUTINGCONTEXT.nested_types_by_name['AttributesEntry'] _SUBSCRIBEROUTINGSTATSREQUEST = DESCRIPTOR.message_types_by_name['SubscribeRoutingStatsRequest'] _TESTROUTEREQUEST = DESCRIPTOR.message_types_by_name['TestRouteRequest'] +_PRINCIPLETARGETINFO = DESCRIPTOR.message_types_by_name['PrincipleTargetInfo'] +_OVERRIDEINFO = DESCRIPTOR.message_types_by_name['OverrideInfo'] +_BALANCERMSG = DESCRIPTOR.message_types_by_name['BalancerMsg'] +_GETBALANCERINFOREQUEST = DESCRIPTOR.message_types_by_name['GetBalancerInfoRequest'] +_GETBALANCERINFORESPONSE = DESCRIPTOR.message_types_by_name['GetBalancerInfoResponse'] +_OVERRIDEBALANCERTARGETREQUEST = DESCRIPTOR.message_types_by_name['OverrideBalancerTargetRequest'] +_OVERRIDEBALANCERTARGETRESPONSE = DESCRIPTOR.message_types_by_name['OverrideBalancerTargetResponse'] +_ADDRULEREQUEST = DESCRIPTOR.message_types_by_name['AddRuleRequest'] +_ADDRULERESPONSE = DESCRIPTOR.message_types_by_name['AddRuleResponse'] +_REMOVERULEREQUEST = DESCRIPTOR.message_types_by_name['RemoveRuleRequest'] +_REMOVERULERESPONSE = DESCRIPTOR.message_types_by_name['RemoveRuleResponse'] _CONFIG = DESCRIPTOR.message_types_by_name['Config'] RoutingContext = _reflection.GeneratedProtocolMessageType('RoutingContext', (_message.Message,), { @@ -53,6 +65,83 @@ }) _sym_db.RegisterMessage(TestRouteRequest) +PrincipleTargetInfo = _reflection.GeneratedProtocolMessageType('PrincipleTargetInfo', (_message.Message,), { + 'DESCRIPTOR' : _PRINCIPLETARGETINFO, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.PrincipleTargetInfo) + }) +_sym_db.RegisterMessage(PrincipleTargetInfo) + +OverrideInfo = _reflection.GeneratedProtocolMessageType('OverrideInfo', (_message.Message,), { + 'DESCRIPTOR' : _OVERRIDEINFO, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.OverrideInfo) + }) +_sym_db.RegisterMessage(OverrideInfo) + +BalancerMsg = _reflection.GeneratedProtocolMessageType('BalancerMsg', (_message.Message,), { + 'DESCRIPTOR' : _BALANCERMSG, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.BalancerMsg) + }) +_sym_db.RegisterMessage(BalancerMsg) + +GetBalancerInfoRequest = _reflection.GeneratedProtocolMessageType('GetBalancerInfoRequest', (_message.Message,), { + 'DESCRIPTOR' : _GETBALANCERINFOREQUEST, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.GetBalancerInfoRequest) + }) +_sym_db.RegisterMessage(GetBalancerInfoRequest) + +GetBalancerInfoResponse = _reflection.GeneratedProtocolMessageType('GetBalancerInfoResponse', (_message.Message,), { + 'DESCRIPTOR' : _GETBALANCERINFORESPONSE, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.GetBalancerInfoResponse) + }) +_sym_db.RegisterMessage(GetBalancerInfoResponse) + +OverrideBalancerTargetRequest = _reflection.GeneratedProtocolMessageType('OverrideBalancerTargetRequest', (_message.Message,), { + 'DESCRIPTOR' : _OVERRIDEBALANCERTARGETREQUEST, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.OverrideBalancerTargetRequest) + }) +_sym_db.RegisterMessage(OverrideBalancerTargetRequest) + +OverrideBalancerTargetResponse = _reflection.GeneratedProtocolMessageType('OverrideBalancerTargetResponse', (_message.Message,), { + 'DESCRIPTOR' : _OVERRIDEBALANCERTARGETRESPONSE, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.OverrideBalancerTargetResponse) + }) +_sym_db.RegisterMessage(OverrideBalancerTargetResponse) + +AddRuleRequest = _reflection.GeneratedProtocolMessageType('AddRuleRequest', (_message.Message,), { + 'DESCRIPTOR' : _ADDRULEREQUEST, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.AddRuleRequest) + }) +_sym_db.RegisterMessage(AddRuleRequest) + +AddRuleResponse = _reflection.GeneratedProtocolMessageType('AddRuleResponse', (_message.Message,), { + 'DESCRIPTOR' : _ADDRULERESPONSE, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.AddRuleResponse) + }) +_sym_db.RegisterMessage(AddRuleResponse) + +RemoveRuleRequest = _reflection.GeneratedProtocolMessageType('RemoveRuleRequest', (_message.Message,), { + 'DESCRIPTOR' : _REMOVERULEREQUEST, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.RemoveRuleRequest) + }) +_sym_db.RegisterMessage(RemoveRuleRequest) + +RemoveRuleResponse = _reflection.GeneratedProtocolMessageType('RemoveRuleResponse', (_message.Message,), { + 'DESCRIPTOR' : _REMOVERULERESPONSE, + '__module__' : 'app.router.command.command_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.command.RemoveRuleResponse) + }) +_sym_db.RegisterMessage(RemoveRuleResponse) + Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { 'DESCRIPTOR' : _CONFIG, '__module__' : 'app.router.command.command_pb2' @@ -67,16 +156,38 @@ DESCRIPTOR._serialized_options = b'\n\033com.xray.app.router.commandP\001Z,github.com/xtls/xray-core/app/router/command\252\002\027Xray.App.Router.Command' _ROUTINGCONTEXT_ATTRIBUTESENTRY._options = None _ROUTINGCONTEXT_ATTRIBUTESENTRY._serialized_options = b'8\001' - _ROUTINGCONTEXT._serialized_start=88 - _ROUTINGCONTEXT._serialized_end=475 - _ROUTINGCONTEXT_ATTRIBUTESENTRY._serialized_start=426 - _ROUTINGCONTEXT_ATTRIBUTESENTRY._serialized_end=475 - _SUBSCRIBEROUTINGSTATSREQUEST._serialized_start=477 - _SUBSCRIBEROUTINGSTATSREQUEST._serialized_end=531 - _TESTROUTEREQUEST._serialized_start=534 - _TESTROUTEREQUEST._serialized_end=664 - _CONFIG._serialized_start=666 - _CONFIG._serialized_end=674 - _ROUTINGSERVICE._serialized_start=677 - _ROUTINGSERVICE._serialized_end=917 + _ROUTINGCONTEXT._serialized_start=123 + _ROUTINGCONTEXT._serialized_end=510 + _ROUTINGCONTEXT_ATTRIBUTESENTRY._serialized_start=461 + _ROUTINGCONTEXT_ATTRIBUTESENTRY._serialized_end=510 + _SUBSCRIBEROUTINGSTATSREQUEST._serialized_start=512 + _SUBSCRIBEROUTINGSTATSREQUEST._serialized_end=566 + _TESTROUTEREQUEST._serialized_start=569 + _TESTROUTEREQUEST._serialized_end=699 + _PRINCIPLETARGETINFO._serialized_start=701 + _PRINCIPLETARGETINFO._serialized_end=735 + _OVERRIDEINFO._serialized_start=737 + _OVERRIDEINFO._serialized_end=767 + _BALANCERMSG._serialized_start=770 + _BALANCERMSG._serialized_end=912 + _GETBALANCERINFOREQUEST._serialized_start=914 + _GETBALANCERINFOREQUEST._serialized_end=951 + _GETBALANCERINFORESPONSE._serialized_start=953 + _GETBALANCERINFORESPONSE._serialized_end=1034 + _OVERRIDEBALANCERTARGETREQUEST._serialized_start=1036 + _OVERRIDEBALANCERTARGETREQUEST._serialized_end=1104 + _OVERRIDEBALANCERTARGETRESPONSE._serialized_start=1106 + _OVERRIDEBALANCERTARGETRESPONSE._serialized_end=1138 + _ADDRULEREQUEST._serialized_start=1140 + _ADDRULEREQUEST._serialized_end=1228 + _ADDRULERESPONSE._serialized_start=1230 + _ADDRULERESPONSE._serialized_end=1247 + _REMOVERULEREQUEST._serialized_start=1249 + _REMOVERULEREQUEST._serialized_end=1285 + _REMOVERULERESPONSE._serialized_start=1287 + _REMOVERULERESPONSE._serialized_end=1307 + _CONFIG._serialized_start=1309 + _CONFIG._serialized_end=1317 + _ROUTINGSERVICE._serialized_start=1320 + _ROUTINGSERVICE._serialized_end=2023 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/app/router/command/command_pb2_grpc.py b/xray_api/proto/app/router/command/command_pb2_grpc.py index 5a4ebe59..e265a15e 100644 --- a/xray_api/proto/app/router/command/command_pb2_grpc.py +++ b/xray_api/proto/app/router/command/command_pb2_grpc.py @@ -24,6 +24,26 @@ def __init__(self, channel): request_serializer=app_dot_router_dot_command_dot_command__pb2.TestRouteRequest.SerializeToString, response_deserializer=app_dot_router_dot_command_dot_command__pb2.RoutingContext.FromString, ) + self.GetBalancerInfo = channel.unary_unary( + '/xray.app.router.command.RoutingService/GetBalancerInfo', + request_serializer=app_dot_router_dot_command_dot_command__pb2.GetBalancerInfoRequest.SerializeToString, + response_deserializer=app_dot_router_dot_command_dot_command__pb2.GetBalancerInfoResponse.FromString, + ) + self.OverrideBalancerTarget = channel.unary_unary( + '/xray.app.router.command.RoutingService/OverrideBalancerTarget', + request_serializer=app_dot_router_dot_command_dot_command__pb2.OverrideBalancerTargetRequest.SerializeToString, + response_deserializer=app_dot_router_dot_command_dot_command__pb2.OverrideBalancerTargetResponse.FromString, + ) + self.AddRule = channel.unary_unary( + '/xray.app.router.command.RoutingService/AddRule', + request_serializer=app_dot_router_dot_command_dot_command__pb2.AddRuleRequest.SerializeToString, + response_deserializer=app_dot_router_dot_command_dot_command__pb2.AddRuleResponse.FromString, + ) + self.RemoveRule = channel.unary_unary( + '/xray.app.router.command.RoutingService/RemoveRule', + request_serializer=app_dot_router_dot_command_dot_command__pb2.RemoveRuleRequest.SerializeToString, + response_deserializer=app_dot_router_dot_command_dot_command__pb2.RemoveRuleResponse.FromString, + ) class RoutingServiceServicer(object): @@ -41,6 +61,30 @@ def TestRoute(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def GetBalancerInfo(self, request, context): + """Missing associated documentation comment in .proto file.""" + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + def OverrideBalancerTarget(self, request, context): + """Missing associated documentation comment in .proto file.""" + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + def AddRule(self, request, context): + """Missing associated documentation comment in .proto file.""" + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + def RemoveRule(self, request, context): + """Missing associated documentation comment in .proto file.""" + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_RoutingServiceServicer_to_server(servicer, server): rpc_method_handlers = { @@ -54,6 +98,26 @@ def add_RoutingServiceServicer_to_server(servicer, server): request_deserializer=app_dot_router_dot_command_dot_command__pb2.TestRouteRequest.FromString, response_serializer=app_dot_router_dot_command_dot_command__pb2.RoutingContext.SerializeToString, ), + 'GetBalancerInfo': grpc.unary_unary_rpc_method_handler( + servicer.GetBalancerInfo, + request_deserializer=app_dot_router_dot_command_dot_command__pb2.GetBalancerInfoRequest.FromString, + response_serializer=app_dot_router_dot_command_dot_command__pb2.GetBalancerInfoResponse.SerializeToString, + ), + 'OverrideBalancerTarget': grpc.unary_unary_rpc_method_handler( + servicer.OverrideBalancerTarget, + request_deserializer=app_dot_router_dot_command_dot_command__pb2.OverrideBalancerTargetRequest.FromString, + response_serializer=app_dot_router_dot_command_dot_command__pb2.OverrideBalancerTargetResponse.SerializeToString, + ), + 'AddRule': grpc.unary_unary_rpc_method_handler( + servicer.AddRule, + request_deserializer=app_dot_router_dot_command_dot_command__pb2.AddRuleRequest.FromString, + response_serializer=app_dot_router_dot_command_dot_command__pb2.AddRuleResponse.SerializeToString, + ), + 'RemoveRule': grpc.unary_unary_rpc_method_handler( + servicer.RemoveRule, + request_deserializer=app_dot_router_dot_command_dot_command__pb2.RemoveRuleRequest.FromString, + response_serializer=app_dot_router_dot_command_dot_command__pb2.RemoveRuleResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'xray.app.router.command.RoutingService', rpc_method_handlers) @@ -97,3 +161,71 @@ def TestRoute(request, app_dot_router_dot_command_dot_command__pb2.RoutingContext.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def GetBalancerInfo(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/xray.app.router.command.RoutingService/GetBalancerInfo', + app_dot_router_dot_command_dot_command__pb2.GetBalancerInfoRequest.SerializeToString, + app_dot_router_dot_command_dot_command__pb2.GetBalancerInfoResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def OverrideBalancerTarget(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/xray.app.router.command.RoutingService/OverrideBalancerTarget', + app_dot_router_dot_command_dot_command__pb2.OverrideBalancerTargetRequest.SerializeToString, + app_dot_router_dot_command_dot_command__pb2.OverrideBalancerTargetResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def AddRule(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/xray.app.router.command.RoutingService/AddRule', + app_dot_router_dot_command_dot_command__pb2.AddRuleRequest.SerializeToString, + app_dot_router_dot_command_dot_command__pb2.AddRuleResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + + @staticmethod + def RemoveRule(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/xray.app.router.command.RoutingService/RemoveRule', + app_dot_router_dot_command_dot_command__pb2.RemoveRuleRequest.SerializeToString, + app_dot_router_dot_command_dot_command__pb2.RemoveRuleResponse.FromString, + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/xray_api/proto/app/router/config_pb2.py b/xray_api/proto/app/router/config_pb2.py index e8e9c0c1..d9077f62 100644 --- a/xray_api/proto/app/router/config_pb2.py +++ b/xray_api/proto/app/router/config_pb2.py @@ -12,11 +12,12 @@ _sym_db = _symbol_database.Default() +from xray_api.proto.common.serial import typed_message_pb2 as common_dot_serial_dot_typed__message__pb2 from xray_api.proto.common.net import port_pb2 as common_dot_net_dot_port__pb2 from xray_api.proto.common.net import network_pb2 as common_dot_net_dot_network__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x61pp/router/config.proto\x12\x0fxray.app.router\x1a\x15\x63ommon/net/port.proto\x1a\x18\x63ommon/net/network.proto\"\x81\x02\n\x06\x44omain\x12*\n\x04type\x18\x01 \x01(\x0e\x32\x1c.xray.app.router.Domain.Type\x12\r\n\x05value\x18\x02 \x01(\t\x12\x34\n\tattribute\x18\x03 \x03(\x0b\x32!.xray.app.router.Domain.Attribute\x1aR\n\tAttribute\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x42\r\n\x0btyped_value\"2\n\x04Type\x12\t\n\x05Plain\x10\x00\x12\t\n\x05Regex\x10\x01\x12\n\n\x06\x44omain\x10\x02\x12\x08\n\x04\x46ull\x10\x03\"\"\n\x04\x43IDR\x12\n\n\x02ip\x18\x01 \x01(\x0c\x12\x0e\n\x06prefix\x18\x02 \x01(\r\"Y\n\x05GeoIP\x12\x14\n\x0c\x63ountry_code\x18\x01 \x01(\t\x12#\n\x04\x63idr\x18\x02 \x03(\x0b\x32\x15.xray.app.router.CIDR\x12\x15\n\rreverse_match\x18\x03 \x01(\x08\"2\n\tGeoIPList\x12%\n\x05\x65ntry\x18\x01 \x03(\x0b\x32\x16.xray.app.router.GeoIP\"H\n\x07GeoSite\x12\x14\n\x0c\x63ountry_code\x18\x01 \x01(\t\x12\'\n\x06\x64omain\x18\x02 \x03(\x0b\x32\x17.xray.app.router.Domain\"6\n\x0bGeoSiteList\x12\'\n\x05\x65ntry\x18\x01 \x03(\x0b\x32\x18.xray.app.router.GeoSite\"\xfc\x04\n\x0bRoutingRule\x12\r\n\x03tag\x18\x01 \x01(\tH\x00\x12\x17\n\rbalancing_tag\x18\x0c \x01(\tH\x00\x12\'\n\x06\x64omain\x18\x02 \x03(\x0b\x32\x17.xray.app.router.Domain\x12\'\n\x04\x63idr\x18\x03 \x03(\x0b\x32\x15.xray.app.router.CIDRB\x02\x18\x01\x12%\n\x05geoip\x18\n \x03(\x0b\x32\x16.xray.app.router.GeoIP\x12\x32\n\nport_range\x18\x04 \x01(\x0b\x32\x1a.xray.common.net.PortRangeB\x02\x18\x01\x12,\n\tport_list\x18\x0e \x01(\x0b\x32\x19.xray.common.net.PortList\x12\x36\n\x0cnetwork_list\x18\x05 \x01(\x0b\x32\x1c.xray.common.net.NetworkListB\x02\x18\x01\x12*\n\x08networks\x18\r \x03(\x0e\x32\x18.xray.common.net.Network\x12.\n\x0bsource_cidr\x18\x06 \x03(\x0b\x32\x15.xray.app.router.CIDRB\x02\x18\x01\x12,\n\x0csource_geoip\x18\x0b \x03(\x0b\x32\x16.xray.app.router.GeoIP\x12\x33\n\x10source_port_list\x18\x10 \x01(\x0b\x32\x19.xray.common.net.PortList\x12\x12\n\nuser_email\x18\x07 \x03(\t\x12\x13\n\x0binbound_tag\x18\x08 \x03(\t\x12\x10\n\x08protocol\x18\t \x03(\t\x12\x12\n\nattributes\x18\x0f \x01(\t\x12\x16\n\x0e\x64omain_matcher\x18\x11 \x01(\tB\x0c\n\ntarget_tag\"I\n\rBalancingRule\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x19\n\x11outbound_selector\x18\x02 \x03(\t\x12\x10\n\x08strategy\x18\x03 \x01(\t\"\xf6\x01\n\x06\x43onfig\x12?\n\x0f\x64omain_strategy\x18\x01 \x01(\x0e\x32&.xray.app.router.Config.DomainStrategy\x12*\n\x04rule\x18\x02 \x03(\x0b\x32\x1c.xray.app.router.RoutingRule\x12\x36\n\x0e\x62\x61lancing_rule\x18\x03 \x03(\x0b\x32\x1e.xray.app.router.BalancingRule\"G\n\x0e\x44omainStrategy\x12\x08\n\x04\x41sIs\x10\x00\x12\t\n\x05UseIp\x10\x01\x12\x10\n\x0cIpIfNonMatch\x10\x02\x12\x0e\n\nIpOnDemand\x10\x03\x42O\n\x13\x63om.xray.app.routerP\x01Z$github.com/xtls/xray-core/app/router\xaa\x02\x0fXray.App.Routerb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x61pp/router/config.proto\x12\x0fxray.app.router\x1a!common/serial/typed_message.proto\x1a\x15\x63ommon/net/port.proto\x1a\x18\x63ommon/net/network.proto\"\x81\x02\n\x06\x44omain\x12*\n\x04type\x18\x01 \x01(\x0e\x32\x1c.xray.app.router.Domain.Type\x12\r\n\x05value\x18\x02 \x01(\t\x12\x34\n\tattribute\x18\x03 \x03(\x0b\x32!.xray.app.router.Domain.Attribute\x1aR\n\tAttribute\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x42\r\n\x0btyped_value\"2\n\x04Type\x12\t\n\x05Plain\x10\x00\x12\t\n\x05Regex\x10\x01\x12\n\n\x06\x44omain\x10\x02\x12\x08\n\x04\x46ull\x10\x03\"\"\n\x04\x43IDR\x12\n\n\x02ip\x18\x01 \x01(\x0c\x12\x0e\n\x06prefix\x18\x02 \x01(\r\"Y\n\x05GeoIP\x12\x14\n\x0c\x63ountry_code\x18\x01 \x01(\t\x12#\n\x04\x63idr\x18\x02 \x03(\x0b\x32\x15.xray.app.router.CIDR\x12\x15\n\rreverse_match\x18\x03 \x01(\x08\"2\n\tGeoIPList\x12%\n\x05\x65ntry\x18\x01 \x03(\x0b\x32\x16.xray.app.router.GeoIP\"H\n\x07GeoSite\x12\x14\n\x0c\x63ountry_code\x18\x01 \x01(\t\x12\'\n\x06\x64omain\x18\x02 \x03(\x0b\x32\x17.xray.app.router.Domain\"6\n\x0bGeoSiteList\x12\'\n\x05\x65ntry\x18\x01 \x03(\x0b\x32\x18.xray.app.router.GeoSite\"\xef\x05\n\x0bRoutingRule\x12\r\n\x03tag\x18\x01 \x01(\tH\x00\x12\x17\n\rbalancing_tag\x18\x0c \x01(\tH\x00\x12\x10\n\x08rule_tag\x18\x12 \x01(\t\x12\'\n\x06\x64omain\x18\x02 \x03(\x0b\x32\x17.xray.app.router.Domain\x12\'\n\x04\x63idr\x18\x03 \x03(\x0b\x32\x15.xray.app.router.CIDRB\x02\x18\x01\x12%\n\x05geoip\x18\n \x03(\x0b\x32\x16.xray.app.router.GeoIP\x12\x32\n\nport_range\x18\x04 \x01(\x0b\x32\x1a.xray.common.net.PortRangeB\x02\x18\x01\x12,\n\tport_list\x18\x0e \x01(\x0b\x32\x19.xray.common.net.PortList\x12\x36\n\x0cnetwork_list\x18\x05 \x01(\x0b\x32\x1c.xray.common.net.NetworkListB\x02\x18\x01\x12*\n\x08networks\x18\r \x03(\x0e\x32\x18.xray.common.net.Network\x12.\n\x0bsource_cidr\x18\x06 \x03(\x0b\x32\x15.xray.app.router.CIDRB\x02\x18\x01\x12,\n\x0csource_geoip\x18\x0b \x03(\x0b\x32\x16.xray.app.router.GeoIP\x12\x33\n\x10source_port_list\x18\x10 \x01(\x0b\x32\x19.xray.common.net.PortList\x12\x12\n\nuser_email\x18\x07 \x03(\t\x12\x13\n\x0binbound_tag\x18\x08 \x03(\t\x12\x10\n\x08protocol\x18\t \x03(\t\x12@\n\nattributes\x18\x0f \x03(\x0b\x32,.xray.app.router.RoutingRule.AttributesEntry\x12\x16\n\x0e\x64omain_matcher\x18\x11 \x01(\t\x1a\x31\n\x0f\x41ttributesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x0c\n\ntarget_tag\"\x9c\x01\n\rBalancingRule\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x19\n\x11outbound_selector\x18\x02 \x03(\t\x12\x10\n\x08strategy\x18\x03 \x01(\t\x12;\n\x11strategy_settings\x18\x04 \x01(\x0b\x32 .xray.common.serial.TypedMessage\x12\x14\n\x0c\x66\x61llback_tag\x18\x05 \x01(\t\">\n\x0eStrategyWeight\x12\x0e\n\x06regexp\x18\x01 \x01(\x08\x12\r\n\x05match\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\x02\"\x91\x01\n\x17StrategyLeastLoadConfig\x12.\n\x05\x63osts\x18\x02 \x03(\x0b\x32\x1f.xray.app.router.StrategyWeight\x12\x11\n\tbaselines\x18\x03 \x03(\x03\x12\x10\n\x08\x65xpected\x18\x04 \x01(\x05\x12\x0e\n\x06maxRTT\x18\x05 \x01(\x03\x12\x11\n\ttolerance\x18\x06 \x01(\x02\"\xf6\x01\n\x06\x43onfig\x12?\n\x0f\x64omain_strategy\x18\x01 \x01(\x0e\x32&.xray.app.router.Config.DomainStrategy\x12*\n\x04rule\x18\x02 \x03(\x0b\x32\x1c.xray.app.router.RoutingRule\x12\x36\n\x0e\x62\x61lancing_rule\x18\x03 \x03(\x0b\x32\x1e.xray.app.router.BalancingRule\"G\n\x0e\x44omainStrategy\x12\x08\n\x04\x41sIs\x10\x00\x12\t\n\x05UseIp\x10\x01\x12\x10\n\x0cIpIfNonMatch\x10\x02\x12\x0e\n\nIpOnDemand\x10\x03\x42O\n\x13\x63om.xray.app.routerP\x01Z$github.com/xtls/xray-core/app/router\xaa\x02\x0fXray.App.Routerb\x06proto3') @@ -28,7 +29,10 @@ _GEOSITE = DESCRIPTOR.message_types_by_name['GeoSite'] _GEOSITELIST = DESCRIPTOR.message_types_by_name['GeoSiteList'] _ROUTINGRULE = DESCRIPTOR.message_types_by_name['RoutingRule'] +_ROUTINGRULE_ATTRIBUTESENTRY = _ROUTINGRULE.nested_types_by_name['AttributesEntry'] _BALANCINGRULE = DESCRIPTOR.message_types_by_name['BalancingRule'] +_STRATEGYWEIGHT = DESCRIPTOR.message_types_by_name['StrategyWeight'] +_STRATEGYLEASTLOADCONFIG = DESCRIPTOR.message_types_by_name['StrategyLeastLoadConfig'] _CONFIG = DESCRIPTOR.message_types_by_name['Config'] _DOMAIN_TYPE = _DOMAIN.enum_types_by_name['Type'] _CONFIG_DOMAINSTRATEGY = _CONFIG.enum_types_by_name['DomainStrategy'] @@ -83,11 +87,19 @@ _sym_db.RegisterMessage(GeoSiteList) RoutingRule = _reflection.GeneratedProtocolMessageType('RoutingRule', (_message.Message,), { + + 'AttributesEntry' : _reflection.GeneratedProtocolMessageType('AttributesEntry', (_message.Message,), { + 'DESCRIPTOR' : _ROUTINGRULE_ATTRIBUTESENTRY, + '__module__' : 'app.router.config_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.RoutingRule.AttributesEntry) + }) + , 'DESCRIPTOR' : _ROUTINGRULE, '__module__' : 'app.router.config_pb2' # @@protoc_insertion_point(class_scope:xray.app.router.RoutingRule) }) _sym_db.RegisterMessage(RoutingRule) +_sym_db.RegisterMessage(RoutingRule.AttributesEntry) BalancingRule = _reflection.GeneratedProtocolMessageType('BalancingRule', (_message.Message,), { 'DESCRIPTOR' : _BALANCINGRULE, @@ -96,6 +108,20 @@ }) _sym_db.RegisterMessage(BalancingRule) +StrategyWeight = _reflection.GeneratedProtocolMessageType('StrategyWeight', (_message.Message,), { + 'DESCRIPTOR' : _STRATEGYWEIGHT, + '__module__' : 'app.router.config_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.StrategyWeight) + }) +_sym_db.RegisterMessage(StrategyWeight) + +StrategyLeastLoadConfig = _reflection.GeneratedProtocolMessageType('StrategyLeastLoadConfig', (_message.Message,), { + 'DESCRIPTOR' : _STRATEGYLEASTLOADCONFIG, + '__module__' : 'app.router.config_pb2' + # @@protoc_insertion_point(class_scope:xray.app.router.StrategyLeastLoadConfig) + }) +_sym_db.RegisterMessage(StrategyLeastLoadConfig) + Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { 'DESCRIPTOR' : _CONFIG, '__module__' : 'app.router.config_pb2' @@ -107,6 +133,8 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\023com.xray.app.routerP\001Z$github.com/xtls/xray-core/app/router\252\002\017Xray.App.Router' + _ROUTINGRULE_ATTRIBUTESENTRY._options = None + _ROUTINGRULE_ATTRIBUTESENTRY._serialized_options = b'8\001' _ROUTINGRULE.fields_by_name['cidr']._options = None _ROUTINGRULE.fields_by_name['cidr']._serialized_options = b'\030\001' _ROUTINGRULE.fields_by_name['port_range']._options = None @@ -115,28 +143,34 @@ _ROUTINGRULE.fields_by_name['network_list']._serialized_options = b'\030\001' _ROUTINGRULE.fields_by_name['source_cidr']._options = None _ROUTINGRULE.fields_by_name['source_cidr']._serialized_options = b'\030\001' - _DOMAIN._serialized_start=94 - _DOMAIN._serialized_end=351 - _DOMAIN_ATTRIBUTE._serialized_start=217 - _DOMAIN_ATTRIBUTE._serialized_end=299 - _DOMAIN_TYPE._serialized_start=301 - _DOMAIN_TYPE._serialized_end=351 - _CIDR._serialized_start=353 - _CIDR._serialized_end=387 - _GEOIP._serialized_start=389 - _GEOIP._serialized_end=478 - _GEOIPLIST._serialized_start=480 - _GEOIPLIST._serialized_end=530 - _GEOSITE._serialized_start=532 - _GEOSITE._serialized_end=604 - _GEOSITELIST._serialized_start=606 - _GEOSITELIST._serialized_end=660 - _ROUTINGRULE._serialized_start=663 - _ROUTINGRULE._serialized_end=1299 - _BALANCINGRULE._serialized_start=1301 - _BALANCINGRULE._serialized_end=1374 - _CONFIG._serialized_start=1377 - _CONFIG._serialized_end=1623 - _CONFIG_DOMAINSTRATEGY._serialized_start=1552 - _CONFIG_DOMAINSTRATEGY._serialized_end=1623 + _DOMAIN._serialized_start=129 + _DOMAIN._serialized_end=386 + _DOMAIN_ATTRIBUTE._serialized_start=252 + _DOMAIN_ATTRIBUTE._serialized_end=334 + _DOMAIN_TYPE._serialized_start=336 + _DOMAIN_TYPE._serialized_end=386 + _CIDR._serialized_start=388 + _CIDR._serialized_end=422 + _GEOIP._serialized_start=424 + _GEOIP._serialized_end=513 + _GEOIPLIST._serialized_start=515 + _GEOIPLIST._serialized_end=565 + _GEOSITE._serialized_start=567 + _GEOSITE._serialized_end=639 + _GEOSITELIST._serialized_start=641 + _GEOSITELIST._serialized_end=695 + _ROUTINGRULE._serialized_start=698 + _ROUTINGRULE._serialized_end=1449 + _ROUTINGRULE_ATTRIBUTESENTRY._serialized_start=1386 + _ROUTINGRULE_ATTRIBUTESENTRY._serialized_end=1435 + _BALANCINGRULE._serialized_start=1452 + _BALANCINGRULE._serialized_end=1608 + _STRATEGYWEIGHT._serialized_start=1610 + _STRATEGYWEIGHT._serialized_end=1672 + _STRATEGYLEASTLOADCONFIG._serialized_start=1675 + _STRATEGYLEASTLOADCONFIG._serialized_end=1820 + _CONFIG._serialized_start=1823 + _CONFIG._serialized_end=2069 + _CONFIG_DOMAINSTRATEGY._serialized_start=1998 + _CONFIG_DOMAINSTRATEGY._serialized_end=2069 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/common/protocol/headers_pb2.py b/xray_api/proto/common/protocol/headers_pb2.py index a204791b..63e2f2b9 100644 --- a/xray_api/proto/common/protocol/headers_pb2.py +++ b/xray_api/proto/common/protocol/headers_pb2.py @@ -15,12 +15,11 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x63ommon/protocol/headers.proto\x12\x14xray.common.protocol\"B\n\x0eSecurityConfig\x12\x30\n\x04type\x18\x01 \x01(\x0e\x32\".xray.common.protocol.SecurityType*l\n\x0cSecurityType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06LEGACY\x10\x01\x12\x08\n\x04\x41UTO\x10\x02\x12\x0e\n\nAES128_GCM\x10\x03\x12\x15\n\x11\x43HACHA20_POLY1305\x10\x04\x12\x08\n\x04NONE\x10\x05\x12\x08\n\x04ZERO\x10\x06\x42^\n\x18\x63om.xray.common.protocolP\x01Z)github.com/xtls/xray-core/common/protocol\xaa\x02\x14Xray.Common.Protocolb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x63ommon/protocol/headers.proto\x12\x14xray.common.protocol\"B\n\x0eSecurityConfig\x12\x30\n\x04type\x18\x01 \x01(\x0e\x32\".xray.common.protocol.SecurityType*`\n\x0cSecurityType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04\x41UTO\x10\x02\x12\x0e\n\nAES128_GCM\x10\x03\x12\x15\n\x11\x43HACHA20_POLY1305\x10\x04\x12\x08\n\x04NONE\x10\x05\x12\x08\n\x04ZERO\x10\x06\x42^\n\x18\x63om.xray.common.protocolP\x01Z)github.com/xtls/xray-core/common/protocol\xaa\x02\x14Xray.Common.Protocolb\x06proto3') _SECURITYTYPE = DESCRIPTOR.enum_types_by_name['SecurityType'] SecurityType = enum_type_wrapper.EnumTypeWrapper(_SECURITYTYPE) UNKNOWN = 0 -LEGACY = 1 AUTO = 2 AES128_GCM = 3 CHACHA20_POLY1305 = 4 @@ -41,7 +40,7 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\030com.xray.common.protocolP\001Z)github.com/xtls/xray-core/common/protocol\252\002\024Xray.Common.Protocol' _SECURITYTYPE._serialized_start=123 - _SECURITYTYPE._serialized_end=231 + _SECURITYTYPE._serialized_end=219 _SECURITYCONFIG._serialized_start=55 _SECURITYCONFIG._serialized_end=121 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/dns/config_pb2.py b/xray_api/proto/proxy/dns/config_pb2.py index 62f02d19..167ef4ad 100644 --- a/xray_api/proto/proxy/dns/config_pb2.py +++ b/xray_api/proto/proxy/dns/config_pb2.py @@ -15,7 +15,7 @@ from xray_api.proto.common.net import destination_pb2 as common_dot_net_dot_destination__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16proxy/dns/config.proto\x12\x0exray.proxy.dns\x1a\x1c\x63ommon/net/destination.proto\"G\n\x06\x43onfig\x12)\n\x06server\x18\x01 \x01(\x0b\x32\x19.xray.common.net.Endpoint\x12\x12\n\nuser_level\x18\x02 \x01(\rBL\n\x12\x63om.xray.proxy.dnsP\x01Z#github.com/xtls/xray-core/proxy/dns\xaa\x02\x0eXray.Proxy.Dnsb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16proxy/dns/config.proto\x12\x0exray.proxy.dns\x1a\x1c\x63ommon/net/destination.proto\"]\n\x06\x43onfig\x12)\n\x06server\x18\x01 \x01(\x0b\x32\x19.xray.common.net.Endpoint\x12\x12\n\nuser_level\x18\x02 \x01(\r\x12\x14\n\x0cnon_IP_query\x18\x03 \x01(\tBL\n\x12\x63om.xray.proxy.dnsP\x01Z#github.com/xtls/xray-core/proxy/dns\xaa\x02\x0eXray.Proxy.Dnsb\x06proto3') @@ -32,5 +32,5 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\022com.xray.proxy.dnsP\001Z#github.com/xtls/xray-core/proxy/dns\252\002\016Xray.Proxy.Dns' _CONFIG._serialized_start=72 - _CONFIG._serialized_end=143 + _CONFIG._serialized_end=165 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/freedom/config_pb2.py b/xray_api/proto/proxy/freedom/config_pb2.py index 99101292..08fd9545 100644 --- a/xray_api/proto/proxy/freedom/config_pb2.py +++ b/xray_api/proto/proxy/freedom/config_pb2.py @@ -15,11 +15,12 @@ from xray_api.proto.common.protocol import server_spec_pb2 as common_dot_protocol_dot_server__spec__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1aproxy/freedom/config.proto\x12\x12xray.proxy.freedom\x1a!common/protocol/server_spec.proto\"K\n\x13\x44\x65stinationOverride\x12\x34\n\x06server\x18\x01 \x01(\x0b\x32$.xray.common.protocol.ServerEndpoint\"\xff\x01\n\x06\x43onfig\x12\x42\n\x0f\x64omain_strategy\x18\x01 \x01(\x0e\x32).xray.proxy.freedom.Config.DomainStrategy\x12\x13\n\x07timeout\x18\x02 \x01(\rB\x02\x18\x01\x12\x45\n\x14\x64\x65stination_override\x18\x03 \x01(\x0b\x32\'.xray.proxy.freedom.DestinationOverride\x12\x12\n\nuser_level\x18\x04 \x01(\r\"A\n\x0e\x44omainStrategy\x12\t\n\x05\x41S_IS\x10\x00\x12\n\n\x06USE_IP\x10\x01\x12\x0b\n\x07USE_IP4\x10\x02\x12\x0b\n\x07USE_IP6\x10\x03\x42X\n\x16\x63om.xray.proxy.freedomP\x01Z\'github.com/xtls/xray-core/proxy/freedom\xaa\x02\x12Xray.Proxy.Freedomb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1aproxy/freedom/config.proto\x12\x12xray.proxy.freedom\x1a!common/protocol/server_spec.proto\"K\n\x13\x44\x65stinationOverride\x12\x34\n\x06server\x18\x01 \x01(\x0b\x32$.xray.common.protocol.ServerEndpoint\"\x88\x01\n\x08\x46ragment\x12\x14\n\x0cpackets_from\x18\x01 \x01(\x04\x12\x12\n\npackets_to\x18\x02 \x01(\x04\x12\x12\n\nlength_min\x18\x03 \x01(\x04\x12\x12\n\nlength_max\x18\x04 \x01(\x04\x12\x14\n\x0cinterval_min\x18\x05 \x01(\x04\x12\x14\n\x0cinterval_max\x18\x06 \x01(\x04\"\xb0\x03\n\x06\x43onfig\x12\x42\n\x0f\x64omain_strategy\x18\x01 \x01(\x0e\x32).xray.proxy.freedom.Config.DomainStrategy\x12\x13\n\x07timeout\x18\x02 \x01(\rB\x02\x18\x01\x12\x45\n\x14\x64\x65stination_override\x18\x03 \x01(\x0b\x32\'.xray.proxy.freedom.DestinationOverride\x12\x12\n\nuser_level\x18\x04 \x01(\r\x12.\n\x08\x66ragment\x18\x05 \x01(\x0b\x32\x1c.xray.proxy.freedom.Fragment\x12\x16\n\x0eproxy_protocol\x18\x06 \x01(\r\"\xa9\x01\n\x0e\x44omainStrategy\x12\t\n\x05\x41S_IS\x10\x00\x12\n\n\x06USE_IP\x10\x01\x12\x0b\n\x07USE_IP4\x10\x02\x12\x0b\n\x07USE_IP6\x10\x03\x12\x0c\n\x08USE_IP46\x10\x04\x12\x0c\n\x08USE_IP64\x10\x05\x12\x0c\n\x08\x46ORCE_IP\x10\x06\x12\r\n\tFORCE_IP4\x10\x07\x12\r\n\tFORCE_IP6\x10\x08\x12\x0e\n\nFORCE_IP46\x10\t\x12\x0e\n\nFORCE_IP64\x10\nBX\n\x16\x63om.xray.proxy.freedomP\x01Z\'github.com/xtls/xray-core/proxy/freedom\xaa\x02\x12Xray.Proxy.Freedomb\x06proto3') _DESTINATIONOVERRIDE = DESCRIPTOR.message_types_by_name['DestinationOverride'] +_FRAGMENT = DESCRIPTOR.message_types_by_name['Fragment'] _CONFIG = DESCRIPTOR.message_types_by_name['Config'] _CONFIG_DOMAINSTRATEGY = _CONFIG.enum_types_by_name['DomainStrategy'] DestinationOverride = _reflection.GeneratedProtocolMessageType('DestinationOverride', (_message.Message,), { @@ -29,6 +30,13 @@ }) _sym_db.RegisterMessage(DestinationOverride) +Fragment = _reflection.GeneratedProtocolMessageType('Fragment', (_message.Message,), { + 'DESCRIPTOR' : _FRAGMENT, + '__module__' : 'proxy.freedom.config_pb2' + # @@protoc_insertion_point(class_scope:xray.proxy.freedom.Fragment) + }) +_sym_db.RegisterMessage(Fragment) + Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { 'DESCRIPTOR' : _CONFIG, '__module__' : 'proxy.freedom.config_pb2' @@ -44,8 +52,10 @@ _CONFIG.fields_by_name['timeout']._serialized_options = b'\030\001' _DESTINATIONOVERRIDE._serialized_start=85 _DESTINATIONOVERRIDE._serialized_end=160 - _CONFIG._serialized_start=163 - _CONFIG._serialized_end=418 - _CONFIG_DOMAINSTRATEGY._serialized_start=353 - _CONFIG_DOMAINSTRATEGY._serialized_end=418 + _FRAGMENT._serialized_start=163 + _FRAGMENT._serialized_end=299 + _CONFIG._serialized_start=302 + _CONFIG._serialized_end=734 + _CONFIG_DOMAINSTRATEGY._serialized_start=565 + _CONFIG_DOMAINSTRATEGY._serialized_end=734 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/http/config_pb2.py b/xray_api/proto/proxy/http/config_pb2.py index 6c3bbf25..44aab7fb 100644 --- a/xray_api/proto/proxy/http/config_pb2.py +++ b/xray_api/proto/proxy/http/config_pb2.py @@ -15,13 +15,14 @@ from xray_api.proto.common.protocol import server_spec_pb2 as common_dot_protocol_dot_server__spec__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17proxy/http/config.proto\x12\x0fxray.proxy.http\x1a!common/protocol/server_spec.proto\"-\n\x07\x41\x63\x63ount\x12\x10\n\x08username\x18\x01 \x01(\t\x12\x10\n\x08password\x18\x02 \x01(\t\"\xc2\x01\n\x0cServerConfig\x12\x13\n\x07timeout\x18\x01 \x01(\rB\x02\x18\x01\x12=\n\x08\x61\x63\x63ounts\x18\x02 \x03(\x0b\x32+.xray.proxy.http.ServerConfig.AccountsEntry\x12\x19\n\x11\x61llow_transparent\x18\x03 \x01(\x08\x12\x12\n\nuser_level\x18\x04 \x01(\r\x1a/\n\rAccountsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"D\n\x0c\x43lientConfig\x12\x34\n\x06server\x18\x01 \x03(\x0b\x32$.xray.common.protocol.ServerEndpointBO\n\x13\x63om.xray.proxy.httpP\x01Z$github.com/xtls/xray-core/proxy/http\xaa\x02\x0fXray.Proxy.Httpb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17proxy/http/config.proto\x12\x0fxray.proxy.http\x1a!common/protocol/server_spec.proto\"-\n\x07\x41\x63\x63ount\x12\x10\n\x08username\x18\x01 \x01(\t\x12\x10\n\x08password\x18\x02 \x01(\t\"\xc2\x01\n\x0cServerConfig\x12\x13\n\x07timeout\x18\x01 \x01(\rB\x02\x18\x01\x12=\n\x08\x61\x63\x63ounts\x18\x02 \x03(\x0b\x32+.xray.proxy.http.ServerConfig.AccountsEntry\x12\x19\n\x11\x61llow_transparent\x18\x03 \x01(\x08\x12\x12\n\nuser_level\x18\x04 \x01(\r\x1a/\n\rAccountsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"$\n\x06Header\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"m\n\x0c\x43lientConfig\x12\x34\n\x06server\x18\x01 \x03(\x0b\x32$.xray.common.protocol.ServerEndpoint\x12\'\n\x06header\x18\x02 \x03(\x0b\x32\x17.xray.proxy.http.HeaderBO\n\x13\x63om.xray.proxy.httpP\x01Z$github.com/xtls/xray-core/proxy/http\xaa\x02\x0fXray.Proxy.Httpb\x06proto3') _ACCOUNT = DESCRIPTOR.message_types_by_name['Account'] _SERVERCONFIG = DESCRIPTOR.message_types_by_name['ServerConfig'] _SERVERCONFIG_ACCOUNTSENTRY = _SERVERCONFIG.nested_types_by_name['AccountsEntry'] +_HEADER = DESCRIPTOR.message_types_by_name['Header'] _CLIENTCONFIG = DESCRIPTOR.message_types_by_name['ClientConfig'] Account = _reflection.GeneratedProtocolMessageType('Account', (_message.Message,), { 'DESCRIPTOR' : _ACCOUNT, @@ -45,6 +46,13 @@ _sym_db.RegisterMessage(ServerConfig) _sym_db.RegisterMessage(ServerConfig.AccountsEntry) +Header = _reflection.GeneratedProtocolMessageType('Header', (_message.Message,), { + 'DESCRIPTOR' : _HEADER, + '__module__' : 'proxy.http.config_pb2' + # @@protoc_insertion_point(class_scope:xray.proxy.http.Header) + }) +_sym_db.RegisterMessage(Header) + ClientConfig = _reflection.GeneratedProtocolMessageType('ClientConfig', (_message.Message,), { 'DESCRIPTOR' : _CLIENTCONFIG, '__module__' : 'proxy.http.config_pb2' @@ -66,6 +74,8 @@ _SERVERCONFIG._serialized_end=321 _SERVERCONFIG_ACCOUNTSENTRY._serialized_start=274 _SERVERCONFIG_ACCOUNTSENTRY._serialized_end=321 - _CLIENTCONFIG._serialized_start=323 - _CLIENTCONFIG._serialized_end=391 + _HEADER._serialized_start=323 + _HEADER._serialized_end=359 + _CLIENTCONFIG._serialized_start=361 + _CLIENTCONFIG._serialized_end=470 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/shadowsocks_2022/config_pb2.py b/xray_api/proto/proxy/shadowsocks_2022/config_pb2.py index 5d325048..a6f7f881 100644 --- a/xray_api/proto/proxy/shadowsocks_2022/config_pb2.py +++ b/xray_api/proto/proxy/shadowsocks_2022/config_pb2.py @@ -16,7 +16,7 @@ from xray_api.proto.common.net import address_pb2 as common_dot_net_dot_address__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#proxy/shadowsocks_2022/config.proto\x12\x1bxray.proxy.shadowsocks_2022\x1a\x18\x63ommon/net/network.proto\x1a\x18\x63ommon/net/address.proto\"t\n\x0cServerConfig\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05\x65mail\x18\x03 \x01(\t\x12\r\n\x05level\x18\x04 \x01(\x05\x12)\n\x07network\x18\x05 \x03(\x0e\x32\x18.xray.common.net.Network\"\x91\x01\n\x15MultiUserServerConfig\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\x30\n\x05users\x18\x03 \x03(\x0b\x32!.xray.proxy.shadowsocks_2022.User\x12)\n\x07network\x18\x04 \x03(\x0e\x32\x18.xray.common.net.Network\"y\n\x10RelayDestination\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\r\n\x05\x65mail\x18\x04 \x01(\t\x12\r\n\x05level\x18\x05 \x01(\x05\"\xa0\x01\n\x11RelayServerConfig\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\x43\n\x0c\x64\x65stinations\x18\x03 \x03(\x0b\x32-.xray.proxy.shadowsocks_2022.RelayDestination\x12)\n\x07network\x18\x04 \x03(\x0e\x32\x18.xray.common.net.Network\"1\n\x04User\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05\x65mail\x18\x02 \x01(\t\x12\r\n\x05level\x18\x03 \x01(\x05\"}\n\x0c\x43lientConfig\x12,\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x0e\n\x06method\x18\x03 \x01(\t\x12\x0b\n\x03key\x18\x04 \x01(\t\x12\x14\n\x0cudp_over_tcp\x18\x05 \x01(\x08\x42r\n\x1f\x63om.xray.proxy.shadowsocks_2022P\x01Z0github.com/xtls/xray-core/proxy/shadowsocks_2022\xaa\x02\x1aXray.Proxy.Shadowsocks2022b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#proxy/shadowsocks_2022/config.proto\x12\x1bxray.proxy.shadowsocks_2022\x1a\x18\x63ommon/net/network.proto\x1a\x18\x63ommon/net/address.proto\"t\n\x0cServerConfig\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05\x65mail\x18\x03 \x01(\t\x12\r\n\x05level\x18\x04 \x01(\x05\x12)\n\x07network\x18\x05 \x03(\x0e\x32\x18.xray.common.net.Network\"\x91\x01\n\x15MultiUserServerConfig\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\x30\n\x05users\x18\x03 \x03(\x0b\x32!.xray.proxy.shadowsocks_2022.User\x12)\n\x07network\x18\x04 \x03(\x0e\x32\x18.xray.common.net.Network\"y\n\x10RelayDestination\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x07\x61\x64\x64ress\x18\x02 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12\x0c\n\x04port\x18\x03 \x01(\r\x12\r\n\x05\x65mail\x18\x04 \x01(\t\x12\r\n\x05level\x18\x05 \x01(\x05\"\xa0\x01\n\x11RelayServerConfig\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\x43\n\x0c\x64\x65stinations\x18\x03 \x03(\x0b\x32-.xray.proxy.shadowsocks_2022.RelayDestination\x12)\n\x07network\x18\x04 \x03(\x0e\x32\x18.xray.common.net.Network\"1\n\x04User\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05\x65mail\x18\x02 \x01(\t\x12\r\n\x05level\x18\x03 \x01(\x05\"\x9b\x01\n\x0c\x43lientConfig\x12,\n\x07\x61\x64\x64ress\x18\x01 \x01(\x0b\x32\x1b.xray.common.net.IPOrDomain\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x0e\n\x06method\x18\x03 \x01(\t\x12\x0b\n\x03key\x18\x04 \x01(\t\x12\x14\n\x0cudp_over_tcp\x18\x05 \x01(\x08\x12\x1c\n\x14udp_over_tcp_version\x18\x06 \x01(\rBr\n\x1f\x63om.xray.proxy.shadowsocks_2022P\x01Z0github.com/xtls/xray-core/proxy/shadowsocks_2022\xaa\x02\x1aXray.Proxy.Shadowsocks2022b\x06proto3') @@ -82,6 +82,6 @@ _RELAYSERVERCONFIG._serialized_end=670 _USER._serialized_start=672 _USER._serialized_end=721 - _CLIENTCONFIG._serialized_start=723 - _CLIENTCONFIG._serialized_end=848 + _CLIENTCONFIG._serialized_start=724 + _CLIENTCONFIG._serialized_end=879 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/trojan/config_pb2.py b/xray_api/proto/proxy/trojan/config_pb2.py index cd38e4b1..af2656bd 100644 --- a/xray_api/proto/proxy/trojan/config_pb2.py +++ b/xray_api/proto/proxy/trojan/config_pb2.py @@ -16,7 +16,7 @@ from xray_api.proto.common.protocol import server_spec_pb2 as common_dot_protocol_dot_server__spec__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19proxy/trojan/config.proto\x12\x11xray.proxy.trojan\x1a\x1a\x63ommon/protocol/user.proto\x1a!common/protocol/server_spec.proto\")\n\x07\x41\x63\x63ount\x12\x10\n\x08password\x18\x01 \x01(\t\x12\x0c\n\x04\x66low\x18\x02 \x01(\t\"^\n\x08\x46\x61llback\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x61lpn\x18\x02 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0c\n\x04\x64\x65st\x18\x05 \x01(\t\x12\x0c\n\x04xver\x18\x06 \x01(\x04\"D\n\x0c\x43lientConfig\x12\x34\n\x06server\x18\x01 \x03(\x0b\x32$.xray.common.protocol.ServerEndpoint\"i\n\x0cServerConfig\x12)\n\x05users\x18\x01 \x03(\x0b\x32\x1a.xray.common.protocol.User\x12.\n\tfallbacks\x18\x03 \x03(\x0b\x32\x1b.xray.proxy.trojan.FallbackBU\n\x15\x63om.xray.proxy.trojanP\x01Z&github.com/xtls/xray-core/proxy/trojan\xaa\x02\x11Xray.Proxy.Trojanb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19proxy/trojan/config.proto\x12\x11xray.proxy.trojan\x1a\x1a\x63ommon/protocol/user.proto\x1a!common/protocol/server_spec.proto\"\x1b\n\x07\x41\x63\x63ount\x12\x10\n\x08password\x18\x01 \x01(\t\"^\n\x08\x46\x61llback\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x61lpn\x18\x02 \x01(\t\x12\x0c\n\x04path\x18\x03 \x01(\t\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0c\n\x04\x64\x65st\x18\x05 \x01(\t\x12\x0c\n\x04xver\x18\x06 \x01(\x04\"D\n\x0c\x43lientConfig\x12\x34\n\x06server\x18\x01 \x03(\x0b\x32$.xray.common.protocol.ServerEndpoint\"i\n\x0cServerConfig\x12)\n\x05users\x18\x01 \x03(\x0b\x32\x1a.xray.common.protocol.User\x12.\n\tfallbacks\x18\x02 \x03(\x0b\x32\x1b.xray.proxy.trojan.FallbackBU\n\x15\x63om.xray.proxy.trojanP\x01Z&github.com/xtls/xray-core/proxy/trojan\xaa\x02\x11Xray.Proxy.Trojanb\x06proto3') @@ -57,11 +57,11 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\025com.xray.proxy.trojanP\001Z&github.com/xtls/xray-core/proxy/trojan\252\002\021Xray.Proxy.Trojan' _ACCOUNT._serialized_start=111 - _ACCOUNT._serialized_end=152 - _FALLBACK._serialized_start=154 - _FALLBACK._serialized_end=248 - _CLIENTCONFIG._serialized_start=250 - _CLIENTCONFIG._serialized_end=318 - _SERVERCONFIG._serialized_start=320 - _SERVERCONFIG._serialized_end=425 + _ACCOUNT._serialized_end=138 + _FALLBACK._serialized_start=140 + _FALLBACK._serialized_end=234 + _CLIENTCONFIG._serialized_start=236 + _CLIENTCONFIG._serialized_end=304 + _SERVERCONFIG._serialized_start=306 + _SERVERCONFIG._serialized_end=411 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/vmess/account_pb2.py b/xray_api/proto/proxy/vmess/account_pb2.py index 9433d00b..c40994f0 100644 --- a/xray_api/proto/proxy/vmess/account_pb2.py +++ b/xray_api/proto/proxy/vmess/account_pb2.py @@ -15,7 +15,7 @@ from xray_api.proto.common.protocol import headers_pb2 as common_dot_protocol_dot_headers__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19proxy/vmess/account.proto\x12\x10xray.proxy.vmess\x1a\x1d\x63ommon/protocol/headers.proto\"\x7f\n\x07\x41\x63\x63ount\x12\n\n\x02id\x18\x01 \x01(\t\x12\x10\n\x08\x61lter_id\x18\x02 \x01(\r\x12?\n\x11security_settings\x18\x03 \x01(\x0b\x32$.xray.common.protocol.SecurityConfig\x12\x15\n\rtests_enabled\x18\x04 \x01(\tBR\n\x14\x63om.xray.proxy.vmessP\x01Z%github.com/xtls/xray-core/proxy/vmess\xaa\x02\x10Xray.Proxy.Vmessb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19proxy/vmess/account.proto\x12\x10xray.proxy.vmess\x1a\x1d\x63ommon/protocol/headers.proto\"m\n\x07\x41\x63\x63ount\x12\n\n\x02id\x18\x01 \x01(\t\x12?\n\x11security_settings\x18\x03 \x01(\x0b\x32$.xray.common.protocol.SecurityConfig\x12\x15\n\rtests_enabled\x18\x04 \x01(\tBR\n\x14\x63om.xray.proxy.vmessP\x01Z%github.com/xtls/xray-core/proxy/vmess\xaa\x02\x10Xray.Proxy.Vmessb\x06proto3') @@ -32,5 +32,5 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.xray.proxy.vmessP\001Z%github.com/xtls/xray-core/proxy/vmess\252\002\020Xray.Proxy.Vmess' _ACCOUNT._serialized_start=78 - _ACCOUNT._serialized_end=205 + _ACCOUNT._serialized_end=187 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/vmess/inbound/config_pb2.py b/xray_api/proto/proxy/vmess/inbound/config_pb2.py index 7e61d815..7b6f06c2 100644 --- a/xray_api/proto/proxy/vmess/inbound/config_pb2.py +++ b/xray_api/proto/proxy/vmess/inbound/config_pb2.py @@ -15,7 +15,7 @@ from xray_api.proto.common.protocol import user_pb2 as common_dot_protocol_dot_user__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n proxy/vmess/inbound/config.proto\x12\x18xray.proxy.vmess.inbound\x1a\x1a\x63ommon/protocol/user.proto\"\x1a\n\x0c\x44\x65tourConfig\x12\n\n\x02to\x18\x01 \x01(\t\"0\n\rDefaultConfig\x12\x10\n\x08\x61lter_id\x18\x01 \x01(\r\x12\r\n\x05level\x18\x02 \x01(\r\"\xc4\x01\n\x06\x43onfig\x12(\n\x04user\x18\x01 \x03(\x0b\x32\x1a.xray.common.protocol.User\x12\x38\n\x07\x64\x65\x66\x61ult\x18\x02 \x01(\x0b\x32\'.xray.proxy.vmess.inbound.DefaultConfig\x12\x36\n\x06\x64\x65tour\x18\x03 \x01(\x0b\x32&.xray.proxy.vmess.inbound.DetourConfig\x12\x1e\n\x16secure_encryption_only\x18\x04 \x01(\x08\x42j\n\x1c\x63om.xray.proxy.vmess.inboundP\x01Z-github.com/xtls/xray-core/proxy/vmess/inbound\xaa\x02\x18Xray.Proxy.Vmess.Inboundb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n proxy/vmess/inbound/config.proto\x12\x18xray.proxy.vmess.inbound\x1a\x1a\x63ommon/protocol/user.proto\"\x1a\n\x0c\x44\x65tourConfig\x12\n\n\x02to\x18\x01 \x01(\t\"\x1e\n\rDefaultConfig\x12\r\n\x05level\x18\x02 \x01(\r\"\xa4\x01\n\x06\x43onfig\x12(\n\x04user\x18\x01 \x03(\x0b\x32\x1a.xray.common.protocol.User\x12\x38\n\x07\x64\x65\x66\x61ult\x18\x02 \x01(\x0b\x32\'.xray.proxy.vmess.inbound.DefaultConfig\x12\x36\n\x06\x64\x65tour\x18\x03 \x01(\x0b\x32&.xray.proxy.vmess.inbound.DetourConfigBj\n\x1c\x63om.xray.proxy.vmess.inboundP\x01Z-github.com/xtls/xray-core/proxy/vmess/inbound\xaa\x02\x18Xray.Proxy.Vmess.Inboundb\x06proto3') @@ -50,7 +50,7 @@ _DETOURCONFIG._serialized_start=90 _DETOURCONFIG._serialized_end=116 _DEFAULTCONFIG._serialized_start=118 - _DEFAULTCONFIG._serialized_end=166 - _CONFIG._serialized_start=169 - _CONFIG._serialized_end=365 + _DEFAULTCONFIG._serialized_end=148 + _CONFIG._serialized_start=151 + _CONFIG._serialized_end=315 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/wireguard/config_pb2.py b/xray_api/proto/proxy/wireguard/config_pb2.py new file mode 100644 index 00000000..46403ce0 --- /dev/null +++ b/xray_api/proto/proxy/wireguard/config_pb2.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: proxy/wireguard/config.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cproxy/wireguard/config.proto\x12\x14xray.proxy.wireguard\"s\n\nPeerConfig\x12\x12\n\npublic_key\x18\x01 \x01(\t\x12\x16\n\x0epre_shared_key\x18\x02 \x01(\t\x12\x10\n\x08\x65ndpoint\x18\x03 \x01(\t\x12\x12\n\nkeep_alive\x18\x04 \x01(\r\x12\x13\n\x0b\x61llowed_ips\x18\x05 \x03(\t\"\xeb\x02\n\x0c\x44\x65viceConfig\x12\x12\n\nsecret_key\x18\x01 \x01(\t\x12\x10\n\x08\x65ndpoint\x18\x02 \x03(\t\x12/\n\x05peers\x18\x03 \x03(\x0b\x32 .xray.proxy.wireguard.PeerConfig\x12\x0b\n\x03mtu\x18\x04 \x01(\x05\x12\x13\n\x0bnum_workers\x18\x05 \x01(\x05\x12\x10\n\x08reserved\x18\x06 \x01(\x0c\x12J\n\x0f\x64omain_strategy\x18\x07 \x01(\x0e\x32\x31.xray.proxy.wireguard.DeviceConfig.DomainStrategy\x12\x11\n\tis_client\x18\x08 \x01(\x08\x12\x13\n\x0bkernel_mode\x18\t \x01(\x08\"\\\n\x0e\x44omainStrategy\x12\x0c\n\x08\x46ORCE_IP\x10\x00\x12\r\n\tFORCE_IP4\x10\x01\x12\r\n\tFORCE_IP6\x10\x02\x12\x0e\n\nFORCE_IP46\x10\x03\x12\x0e\n\nFORCE_IP64\x10\x04\x42^\n\x18\x63om.xray.proxy.wireguardP\x01Z)github.com/xtls/xray-core/proxy/wireguard\xaa\x02\x14Xray.Proxy.WireGuardb\x06proto3') + + + +_PEERCONFIG = DESCRIPTOR.message_types_by_name['PeerConfig'] +_DEVICECONFIG = DESCRIPTOR.message_types_by_name['DeviceConfig'] +_DEVICECONFIG_DOMAINSTRATEGY = _DEVICECONFIG.enum_types_by_name['DomainStrategy'] +PeerConfig = _reflection.GeneratedProtocolMessageType('PeerConfig', (_message.Message,), { + 'DESCRIPTOR' : _PEERCONFIG, + '__module__' : 'proxy.wireguard.config_pb2' + # @@protoc_insertion_point(class_scope:xray.proxy.wireguard.PeerConfig) + }) +_sym_db.RegisterMessage(PeerConfig) + +DeviceConfig = _reflection.GeneratedProtocolMessageType('DeviceConfig', (_message.Message,), { + 'DESCRIPTOR' : _DEVICECONFIG, + '__module__' : 'proxy.wireguard.config_pb2' + # @@protoc_insertion_point(class_scope:xray.proxy.wireguard.DeviceConfig) + }) +_sym_db.RegisterMessage(DeviceConfig) + +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\030com.xray.proxy.wireguardP\001Z)github.com/xtls/xray-core/proxy/wireguard\252\002\024Xray.Proxy.WireGuard' + _PEERCONFIG._serialized_start=54 + _PEERCONFIG._serialized_end=169 + _DEVICECONFIG._serialized_start=172 + _DEVICECONFIG._serialized_end=535 + _DEVICECONFIG_DOMAINSTRATEGY._serialized_start=443 + _DEVICECONFIG_DOMAINSTRATEGY._serialized_end=535 +# @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/proxy/wireguard/config_pb2_grpc.py b/xray_api/proto/proxy/wireguard/config_pb2_grpc.py new file mode 100644 index 00000000..2daafffe --- /dev/null +++ b/xray_api/proto/proxy/wireguard/config_pb2_grpc.py @@ -0,0 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + diff --git a/xray_api/proto/transport/internet/config_pb2.py b/xray_api/proto/transport/internet/config_pb2.py index a29bb7f0..2983bdf1 100644 --- a/xray_api/proto/transport/internet/config_pb2.py +++ b/xray_api/proto/transport/internet/config_pb2.py @@ -16,7 +16,7 @@ from xray_api.proto.common.serial import typed_message_pb2 as common_dot_serial_dot_typed__message__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ftransport/internet/config.proto\x12\x17xray.transport.internet\x1a!common/serial/typed_message.proto\"\x9e\x01\n\x0fTransportConfig\x12@\n\x08protocol\x18\x01 \x01(\x0e\x32*.xray.transport.internet.TransportProtocolB\x02\x18\x01\x12\x15\n\rprotocol_name\x18\x03 \x01(\t\x12\x32\n\x08settings\x18\x02 \x01(\x0b\x32 .xray.common.serial.TypedMessage\"\xc1\x02\n\x0cStreamConfig\x12@\n\x08protocol\x18\x01 \x01(\x0e\x32*.xray.transport.internet.TransportProtocolB\x02\x18\x01\x12\x15\n\rprotocol_name\x18\x05 \x01(\t\x12\x44\n\x12transport_settings\x18\x02 \x03(\x0b\x32(.xray.transport.internet.TransportConfig\x12\x15\n\rsecurity_type\x18\x03 \x01(\t\x12;\n\x11security_settings\x18\x04 \x03(\x0b\x32 .xray.common.serial.TypedMessage\x12>\n\x0fsocket_settings\x18\x06 \x01(\x0b\x32%.xray.transport.internet.SocketConfig\"7\n\x0bProxyConfig\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x1b\n\x13transportLayerProxy\x18\x02 \x01(\x08\"\xb9\x03\n\x0cSocketConfig\x12\x0c\n\x04mark\x18\x01 \x01(\x05\x12\x0b\n\x03tfo\x18\x02 \x01(\x05\x12@\n\x06tproxy\x18\x03 \x01(\x0e\x32\x30.xray.transport.internet.SocketConfig.TProxyMode\x12%\n\x1dreceive_original_dest_address\x18\x04 \x01(\x08\x12\x14\n\x0c\x62ind_address\x18\x05 \x01(\x0c\x12\x11\n\tbind_port\x18\x06 \x01(\r\x12\x1d\n\x15\x61\x63\x63\x65pt_proxy_protocol\x18\x07 \x01(\x08\x12@\n\x0f\x64omain_strategy\x18\x08 \x01(\x0e\x32\'.xray.transport.internet.DomainStrategy\x12\x14\n\x0c\x64ialer_proxy\x18\t \x01(\t\x12\x1f\n\x17tcp_keep_alive_interval\x18\n \x01(\x05\x12\x1b\n\x13tcp_keep_alive_idle\x18\x0b \x01(\x05\x12\x16\n\x0etcp_congestion\x18\x0c \x01(\t\"/\n\nTProxyMode\x12\x07\n\x03Off\x10\x00\x12\n\n\x06TProxy\x10\x01\x12\x0c\n\x08Redirect\x10\x02*Z\n\x11TransportProtocol\x12\x07\n\x03TCP\x10\x00\x12\x07\n\x03UDP\x10\x01\x12\x08\n\x04MKCP\x10\x02\x12\r\n\tWebSocket\x10\x03\x12\x08\n\x04HTTP\x10\x04\x12\x10\n\x0c\x44omainSocket\x10\x05*A\n\x0e\x44omainStrategy\x12\t\n\x05\x41S_IS\x10\x00\x12\n\n\x06USE_IP\x10\x01\x12\x0b\n\x07USE_IP4\x10\x02\x12\x0b\n\x07USE_IP6\x10\x03\x42g\n\x1b\x63om.xray.transport.internetP\x01Z,github.com/xtls/xray-core/transport/internet\xaa\x02\x17Xray.Transport.Internetb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ftransport/internet/config.proto\x12\x17xray.transport.internet\x1a!common/serial/typed_message.proto\"\x9e\x01\n\x0fTransportConfig\x12@\n\x08protocol\x18\x01 \x01(\x0e\x32*.xray.transport.internet.TransportProtocolB\x02\x18\x01\x12\x15\n\rprotocol_name\x18\x03 \x01(\t\x12\x32\n\x08settings\x18\x02 \x01(\x0b\x32 .xray.common.serial.TypedMessage\"\xc1\x02\n\x0cStreamConfig\x12@\n\x08protocol\x18\x01 \x01(\x0e\x32*.xray.transport.internet.TransportProtocolB\x02\x18\x01\x12\x15\n\rprotocol_name\x18\x05 \x01(\t\x12\x44\n\x12transport_settings\x18\x02 \x03(\x0b\x32(.xray.transport.internet.TransportConfig\x12\x15\n\rsecurity_type\x18\x03 \x01(\t\x12;\n\x11security_settings\x18\x04 \x03(\x0b\x32 .xray.common.serial.TypedMessage\x12>\n\x0fsocket_settings\x18\x06 \x01(\x0b\x32%.xray.transport.internet.SocketConfig\"7\n\x0bProxyConfig\x12\x0b\n\x03tag\x18\x01 \x01(\t\x12\x1b\n\x13transportLayerProxy\x18\x02 \x01(\x08\"\xce\x04\n\x0cSocketConfig\x12\x0c\n\x04mark\x18\x01 \x01(\x05\x12\x0b\n\x03tfo\x18\x02 \x01(\x05\x12@\n\x06tproxy\x18\x03 \x01(\x0e\x32\x30.xray.transport.internet.SocketConfig.TProxyMode\x12%\n\x1dreceive_original_dest_address\x18\x04 \x01(\x08\x12\x14\n\x0c\x62ind_address\x18\x05 \x01(\x0c\x12\x11\n\tbind_port\x18\x06 \x01(\r\x12\x1d\n\x15\x61\x63\x63\x65pt_proxy_protocol\x18\x07 \x01(\x08\x12@\n\x0f\x64omain_strategy\x18\x08 \x01(\x0e\x32\'.xray.transport.internet.DomainStrategy\x12\x14\n\x0c\x64ialer_proxy\x18\t \x01(\t\x12\x1f\n\x17tcp_keep_alive_interval\x18\n \x01(\x05\x12\x1b\n\x13tcp_keep_alive_idle\x18\x0b \x01(\x05\x12\x16\n\x0etcp_congestion\x18\x0c \x01(\t\x12\x11\n\tinterface\x18\r \x01(\t\x12\x0e\n\x06v6only\x18\x0e \x01(\x08\x12\x18\n\x10tcp_window_clamp\x18\x0f \x01(\x05\x12\x18\n\x10tcp_user_timeout\x18\x10 \x01(\x05\x12\x13\n\x0btcp_max_seg\x18\x11 \x01(\x05\x12\x14\n\x0ctcp_no_delay\x18\x12 \x01(\x08\x12\x11\n\ttcp_mptcp\x18\x13 \x01(\x08\"/\n\nTProxyMode\x12\x07\n\x03Off\x10\x00\x12\n\n\x06TProxy\x10\x01\x12\x0c\n\x08Redirect\x10\x02*k\n\x11TransportProtocol\x12\x07\n\x03TCP\x10\x00\x12\x07\n\x03UDP\x10\x01\x12\x08\n\x04MKCP\x10\x02\x12\r\n\tWebSocket\x10\x03\x12\x08\n\x04HTTP\x10\x04\x12\x10\n\x0c\x44omainSocket\x10\x05\x12\x0f\n\x0bHTTPUpgrade\x10\x06*\xa9\x01\n\x0e\x44omainStrategy\x12\t\n\x05\x41S_IS\x10\x00\x12\n\n\x06USE_IP\x10\x01\x12\x0b\n\x07USE_IP4\x10\x02\x12\x0b\n\x07USE_IP6\x10\x03\x12\x0c\n\x08USE_IP46\x10\x04\x12\x0c\n\x08USE_IP64\x10\x05\x12\x0c\n\x08\x46ORCE_IP\x10\x06\x12\r\n\tFORCE_IP4\x10\x07\x12\r\n\tFORCE_IP6\x10\x08\x12\x0e\n\nFORCE_IP46\x10\t\x12\x0e\n\nFORCE_IP64\x10\nBg\n\x1b\x63om.xray.transport.internetP\x01Z,github.com/xtls/xray-core/transport/internet\xaa\x02\x17Xray.Transport.Internetb\x06proto3') _TRANSPORTPROTOCOL = DESCRIPTOR.enum_types_by_name['TransportProtocol'] TransportProtocol = enum_type_wrapper.EnumTypeWrapper(_TRANSPORTPROTOCOL) @@ -28,10 +28,18 @@ WebSocket = 3 HTTP = 4 DomainSocket = 5 +HTTPUpgrade = 6 AS_IS = 0 USE_IP = 1 USE_IP4 = 2 USE_IP6 = 3 +USE_IP46 = 4 +USE_IP64 = 5 +FORCE_IP = 6 +FORCE_IP4 = 7 +FORCE_IP6 = 8 +FORCE_IP46 = 9 +FORCE_IP64 = 10 _TRANSPORTCONFIG = DESCRIPTOR.message_types_by_name['TransportConfig'] @@ -75,10 +83,10 @@ _TRANSPORTCONFIG.fields_by_name['protocol']._serialized_options = b'\030\001' _STREAMCONFIG.fields_by_name['protocol']._options = None _STREAMCONFIG.fields_by_name['protocol']._serialized_options = b'\030\001' - _TRANSPORTPROTOCOL._serialized_start=1081 - _TRANSPORTPROTOCOL._serialized_end=1171 - _DOMAINSTRATEGY._serialized_start=1173 - _DOMAINSTRATEGY._serialized_end=1238 + _TRANSPORTPROTOCOL._serialized_start=1230 + _TRANSPORTPROTOCOL._serialized_end=1337 + _DOMAINSTRATEGY._serialized_start=1340 + _DOMAINSTRATEGY._serialized_end=1509 _TRANSPORTCONFIG._serialized_start=96 _TRANSPORTCONFIG._serialized_end=254 _STREAMCONFIG._serialized_start=257 @@ -86,7 +94,7 @@ _PROXYCONFIG._serialized_start=580 _PROXYCONFIG._serialized_end=635 _SOCKETCONFIG._serialized_start=638 - _SOCKETCONFIG._serialized_end=1079 - _SOCKETCONFIG_TPROXYMODE._serialized_start=1032 - _SOCKETCONFIG_TPROXYMODE._serialized_end=1079 + _SOCKETCONFIG._serialized_end=1228 + _SOCKETCONFIG_TPROXYMODE._serialized_start=1181 + _SOCKETCONFIG_TPROXYMODE._serialized_end=1228 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/transport/internet/grpc/config_pb2.py b/xray_api/proto/transport/internet/grpc/config_pb2.py index 4d87a16f..854c3f19 100644 --- a/xray_api/proto/transport/internet/grpc/config_pb2.py +++ b/xray_api/proto/transport/internet/grpc/config_pb2.py @@ -14,7 +14,7 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$transport/internet/grpc/config.proto\x12%xray.transport.internet.grpc.encoding\"\xb1\x01\n\x06\x43onfig\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x14\n\x0cservice_name\x18\x02 \x01(\t\x12\x12\n\nmulti_mode\x18\x03 \x01(\x08\x12\x14\n\x0cidle_timeout\x18\x04 \x01(\x05\x12\x1c\n\x14health_check_timeout\x18\x05 \x01(\x05\x12\x1d\n\x15permit_without_stream\x18\x06 \x01(\x08\x12\x1c\n\x14initial_windows_size\x18\x07 \x01(\x05\x42\x33Z1github.com/xtls/xray-core/transport/internet/grpcb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$transport/internet/grpc/config.proto\x12%xray.transport.internet.grpc.encoding\"\xca\x01\n\x06\x43onfig\x12\x11\n\tauthority\x18\x01 \x01(\t\x12\x14\n\x0cservice_name\x18\x02 \x01(\t\x12\x12\n\nmulti_mode\x18\x03 \x01(\x08\x12\x14\n\x0cidle_timeout\x18\x04 \x01(\x05\x12\x1c\n\x14health_check_timeout\x18\x05 \x01(\x05\x12\x1d\n\x15permit_without_stream\x18\x06 \x01(\x08\x12\x1c\n\x14initial_windows_size\x18\x07 \x01(\x05\x12\x12\n\nuser_agent\x18\x08 \x01(\tB3Z1github.com/xtls/xray-core/transport/internet/grpcb\x06proto3') @@ -31,5 +31,5 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'Z1github.com/xtls/xray-core/transport/internet/grpc' _CONFIG._serialized_start=80 - _CONFIG._serialized_end=257 + _CONFIG._serialized_end=282 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/transport/internet/headers/dns/config_pb2.py b/xray_api/proto/transport/internet/headers/dns/config_pb2.py new file mode 100644 index 00000000..87819b84 --- /dev/null +++ b/xray_api/proto/transport/internet/headers/dns/config_pb2.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: transport/internet/headers/dns/config.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+transport/internet/headers/dns/config.proto\x12#xray.transport.internet.headers.dns\"\x18\n\x06\x43onfig\x12\x0e\n\x06\x64omain\x18\x01 \x01(\tB\x8b\x01\n\'com.xray.transport.internet.headers.dnsP\x01Z8github.com/xtls/xray-core/transport/internet/headers/dns\xaa\x02#Xray.Transport.Internet.Headers.DNSb\x06proto3') + + + +_CONFIG = DESCRIPTOR.message_types_by_name['Config'] +Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { + 'DESCRIPTOR' : _CONFIG, + '__module__' : 'transport.internet.headers.dns.config_pb2' + # @@protoc_insertion_point(class_scope:xray.transport.internet.headers.dns.Config) + }) +_sym_db.RegisterMessage(Config) + +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\'com.xray.transport.internet.headers.dnsP\001Z8github.com/xtls/xray-core/transport/internet/headers/dns\252\002#Xray.Transport.Internet.Headers.DNS' + _CONFIG._serialized_start=84 + _CONFIG._serialized_end=108 +# @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/transport/internet/headers/dns/config_pb2_grpc.py b/xray_api/proto/transport/internet/headers/dns/config_pb2_grpc.py new file mode 100644 index 00000000..2daafffe --- /dev/null +++ b/xray_api/proto/transport/internet/headers/dns/config_pb2_grpc.py @@ -0,0 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + diff --git a/xray_api/proto/transport/internet/httpupgrade/config_pb2.py b/xray_api/proto/transport/internet/httpupgrade/config_pb2.py new file mode 100644 index 00000000..6cffea5d --- /dev/null +++ b/xray_api/proto/transport/internet/httpupgrade/config_pb2.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: transport/internet/httpupgrade/config.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+transport/internet/httpupgrade/config.proto\x12#xray.transport.internet.httpupgrade\"\xc7\x01\n\x06\x43onfig\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\t\x12G\n\x06header\x18\x03 \x03(\x0b\x32\x37.xray.transport.internet.httpupgrade.Config.HeaderEntry\x12\x1d\n\x15\x61\x63\x63\x65pt_proxy_protocol\x18\x04 \x01(\x08\x12\n\n\x02\x65\x64\x18\x05 \x01(\r\x1a-\n\x0bHeaderEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x8b\x01\n\'com.xray.transport.internet.httpupgradeP\x01Z8github.com/xtls/xray-core/transport/internet/httpupgrade\xaa\x02#Xray.Transport.Internet.HttpUpgradeb\x06proto3') + + + +_CONFIG = DESCRIPTOR.message_types_by_name['Config'] +_CONFIG_HEADERENTRY = _CONFIG.nested_types_by_name['HeaderEntry'] +Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { + + 'HeaderEntry' : _reflection.GeneratedProtocolMessageType('HeaderEntry', (_message.Message,), { + 'DESCRIPTOR' : _CONFIG_HEADERENTRY, + '__module__' : 'transport.internet.httpupgrade.config_pb2' + # @@protoc_insertion_point(class_scope:xray.transport.internet.httpupgrade.Config.HeaderEntry) + }) + , + 'DESCRIPTOR' : _CONFIG, + '__module__' : 'transport.internet.httpupgrade.config_pb2' + # @@protoc_insertion_point(class_scope:xray.transport.internet.httpupgrade.Config) + }) +_sym_db.RegisterMessage(Config) +_sym_db.RegisterMessage(Config.HeaderEntry) + +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\'com.xray.transport.internet.httpupgradeP\001Z8github.com/xtls/xray-core/transport/internet/httpupgrade\252\002#Xray.Transport.Internet.HttpUpgrade' + _CONFIG_HEADERENTRY._options = None + _CONFIG_HEADERENTRY._serialized_options = b'8\001' + _CONFIG._serialized_start=85 + _CONFIG._serialized_end=284 + _CONFIG_HEADERENTRY._serialized_start=239 + _CONFIG_HEADERENTRY._serialized_end=284 +# @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/transport/internet/httpupgrade/config_pb2_grpc.py b/xray_api/proto/transport/internet/httpupgrade/config_pb2_grpc.py new file mode 100644 index 00000000..2daafffe --- /dev/null +++ b/xray_api/proto/transport/internet/httpupgrade/config_pb2_grpc.py @@ -0,0 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + diff --git a/xray_api/proto/transport/internet/reality/config_pb2.py b/xray_api/proto/transport/internet/reality/config_pb2.py new file mode 100644 index 00000000..ed976a09 --- /dev/null +++ b/xray_api/proto/transport/internet/reality/config_pb2.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: transport/internet/reality/config.proto +"""Generated protocol buffer code.""" +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'transport/internet/reality/config.proto\x12\x1fxray.transport.internet.reality\"\xd1\x02\n\x06\x43onfig\x12\x0c\n\x04show\x18\x01 \x01(\x08\x12\x0c\n\x04\x64\x65st\x18\x02 \x01(\t\x12\x0c\n\x04type\x18\x03 \x01(\t\x12\x0c\n\x04xver\x18\x04 \x01(\x04\x12\x14\n\x0cserver_names\x18\x05 \x03(\t\x12\x13\n\x0bprivate_key\x18\x06 \x01(\x0c\x12\x16\n\x0emin_client_ver\x18\x07 \x01(\x0c\x12\x16\n\x0emax_client_ver\x18\x08 \x01(\x0c\x12\x15\n\rmax_time_diff\x18\t \x01(\x04\x12\x11\n\tshort_ids\x18\n \x03(\x0c\x12\x13\n\x0b\x46ingerprint\x18\x15 \x01(\t\x12\x13\n\x0bserver_name\x18\x16 \x01(\t\x12\x12\n\npublic_key\x18\x17 \x01(\x0c\x12\x10\n\x08short_id\x18\x18 \x01(\x0c\x12\x10\n\x08spider_x\x18\x19 \x01(\t\x12\x10\n\x08spider_y\x18\x1a \x03(\x03\x12\x16\n\x0emaster_key_log\x18\x1b \x01(\tB\x7f\n#com.xray.transport.internet.realityP\x01Z4github.com/xtls/xray-core/transport/internet/reality\xaa\x02\x1fXray.Transport.Internet.Realityb\x06proto3') + + + +_CONFIG = DESCRIPTOR.message_types_by_name['Config'] +Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { + 'DESCRIPTOR' : _CONFIG, + '__module__' : 'transport.internet.reality.config_pb2' + # @@protoc_insertion_point(class_scope:xray.transport.internet.reality.Config) + }) +_sym_db.RegisterMessage(Config) + +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n#com.xray.transport.internet.realityP\001Z4github.com/xtls/xray-core/transport/internet/reality\252\002\037Xray.Transport.Internet.Reality' + _CONFIG._serialized_start=77 + _CONFIG._serialized_end=414 +# @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/transport/internet/reality/config_pb2_grpc.py b/xray_api/proto/transport/internet/reality/config_pb2_grpc.py new file mode 100644 index 00000000..2daafffe --- /dev/null +++ b/xray_api/proto/transport/internet/reality/config_pb2_grpc.py @@ -0,0 +1,4 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +"""Client and server classes corresponding to protobuf-defined services.""" +import grpc + diff --git a/xray_api/proto/transport/internet/tls/config_pb2.py b/xray_api/proto/transport/internet/tls/config_pb2.py index 559c0577..6cf7eb78 100644 --- a/xray_api/proto/transport/internet/tls/config_pb2.py +++ b/xray_api/proto/transport/internet/tls/config_pb2.py @@ -14,7 +14,7 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#transport/internet/tls/config.proto\x12\x1bxray.transport.internet.tls\"\x91\x02\n\x0b\x43\x65rtificate\x12\x13\n\x0b\x63\x65rtificate\x18\x01 \x01(\x0c\x12\x0b\n\x03key\x18\x02 \x01(\x0c\x12=\n\x05usage\x18\x03 \x01(\x0e\x32..xray.transport.internet.tls.Certificate.Usage\x12\x15\n\rocsp_stapling\x18\x04 \x01(\x04\x12\x18\n\x10\x63\x65rtificate_path\x18\x05 \x01(\t\x12\x10\n\x08key_path\x18\x06 \x01(\t\x12\x18\n\x10One_time_loading\x18\x07 \x01(\x08\"D\n\x05Usage\x12\x10\n\x0c\x45NCIPHERMENT\x10\x00\x12\x14\n\x10\x41UTHORITY_VERIFY\x10\x01\x12\x13\n\x0f\x41UTHORITY_ISSUE\x10\x02\"\x90\x03\n\x06\x43onfig\x12\x16\n\x0e\x61llow_insecure\x18\x01 \x01(\x08\x12=\n\x0b\x63\x65rtificate\x18\x02 \x03(\x0b\x32(.xray.transport.internet.tls.Certificate\x12\x13\n\x0bserver_name\x18\x03 \x01(\t\x12\x15\n\rnext_protocol\x18\x04 \x03(\t\x12!\n\x19\x65nable_session_resumption\x18\x05 \x01(\x08\x12\x1b\n\x13\x64isable_system_root\x18\x06 \x01(\x08\x12\x13\n\x0bmin_version\x18\x07 \x01(\t\x12\x13\n\x0bmax_version\x18\x08 \x01(\t\x12\x15\n\rcipher_suites\x18\t \x01(\t\x12#\n\x1bprefer_server_cipher_suites\x18\n \x01(\x08\x12\x13\n\x0b\x66ingerprint\x18\x0b \x01(\t\x12\x1a\n\x12reject_unknown_sni\x18\x0c \x01(\x08\x12,\n$pinned_peer_certificate_chain_sha256\x18\r \x03(\x0c\x42s\n\x1f\x63om.xray.transport.internet.tlsP\x01Z0github.com/xtls/xray-core/transport/internet/tls\xaa\x02\x1bXray.Transport.Internet.Tlsb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#transport/internet/tls/config.proto\x12\x1bxray.transport.internet.tls\"\x91\x02\n\x0b\x43\x65rtificate\x12\x13\n\x0b\x63\x65rtificate\x18\x01 \x01(\x0c\x12\x0b\n\x03key\x18\x02 \x01(\x0c\x12=\n\x05usage\x18\x03 \x01(\x0e\x32..xray.transport.internet.tls.Certificate.Usage\x12\x15\n\rocsp_stapling\x18\x04 \x01(\x04\x12\x18\n\x10\x63\x65rtificate_path\x18\x05 \x01(\t\x12\x10\n\x08key_path\x18\x06 \x01(\t\x12\x18\n\x10One_time_loading\x18\x07 \x01(\x08\"D\n\x05Usage\x12\x10\n\x0c\x45NCIPHERMENT\x10\x00\x12\x14\n\x10\x41UTHORITY_VERIFY\x10\x01\x12\x13\n\x0f\x41UTHORITY_ISSUE\x10\x02\"\xdf\x03\n\x06\x43onfig\x12\x16\n\x0e\x61llow_insecure\x18\x01 \x01(\x08\x12=\n\x0b\x63\x65rtificate\x18\x02 \x03(\x0b\x32(.xray.transport.internet.tls.Certificate\x12\x13\n\x0bserver_name\x18\x03 \x01(\t\x12\x15\n\rnext_protocol\x18\x04 \x03(\t\x12!\n\x19\x65nable_session_resumption\x18\x05 \x01(\x08\x12\x1b\n\x13\x64isable_system_root\x18\x06 \x01(\x08\x12\x13\n\x0bmin_version\x18\x07 \x01(\t\x12\x13\n\x0bmax_version\x18\x08 \x01(\t\x12\x15\n\rcipher_suites\x18\t \x01(\t\x12\'\n\x1bprefer_server_cipher_suites\x18\n \x01(\x08\x42\x02\x18\x01\x12\x13\n\x0b\x66ingerprint\x18\x0b \x01(\t\x12\x1a\n\x12reject_unknown_sni\x18\x0c \x01(\x08\x12,\n$pinned_peer_certificate_chain_sha256\x18\r \x03(\x0c\x12\x31\n)pinned_peer_certificate_public_key_sha256\x18\x0e \x03(\x0c\x12\x16\n\x0emaster_key_log\x18\x0f \x01(\tBs\n\x1f\x63om.xray.transport.internet.tlsP\x01Z0github.com/xtls/xray-core/transport/internet/tls\xaa\x02\x1bXray.Transport.Internet.Tlsb\x06proto3') @@ -39,10 +39,12 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\037com.xray.transport.internet.tlsP\001Z0github.com/xtls/xray-core/transport/internet/tls\252\002\033Xray.Transport.Internet.Tls' + _CONFIG.fields_by_name['prefer_server_cipher_suites']._options = None + _CONFIG.fields_by_name['prefer_server_cipher_suites']._serialized_options = b'\030\001' _CERTIFICATE._serialized_start=69 _CERTIFICATE._serialized_end=342 _CERTIFICATE_USAGE._serialized_start=274 _CERTIFICATE_USAGE._serialized_end=342 _CONFIG._serialized_start=345 - _CONFIG._serialized_end=745 + _CONFIG._serialized_end=824 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/proto/transport/internet/websocket/config_pb2.py b/xray_api/proto/transport/internet/websocket/config_pb2.py index e0d04d93..abd5e93c 100644 --- a/xray_api/proto/transport/internet/websocket/config_pb2.py +++ b/xray_api/proto/transport/internet/websocket/config_pb2.py @@ -14,32 +14,35 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)transport/internet/websocket/config.proto\x12!xray.transport.internet.websocket\"$\n\x06Header\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\x82\x01\n\x06\x43onfig\x12\x0c\n\x04path\x18\x02 \x01(\t\x12\x39\n\x06header\x18\x03 \x03(\x0b\x32).xray.transport.internet.websocket.Header\x12\x1d\n\x15\x61\x63\x63\x65pt_proxy_protocol\x18\x04 \x01(\x08\x12\n\n\x02\x65\x64\x18\x05 \x01(\rJ\x04\x08\x01\x10\x02\x42\x85\x01\n%com.xray.transport.internet.websocketP\x01Z6github.com/xtls/xray-core/transport/internet/websocket\xaa\x02!Xray.Transport.Internet.Websocketb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)transport/internet/websocket/config.proto\x12!xray.transport.internet.websocket\"\xc5\x01\n\x06\x43onfig\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\t\x12\x45\n\x06header\x18\x03 \x03(\x0b\x32\x35.xray.transport.internet.websocket.Config.HeaderEntry\x12\x1d\n\x15\x61\x63\x63\x65pt_proxy_protocol\x18\x04 \x01(\x08\x12\n\n\x02\x65\x64\x18\x05 \x01(\r\x1a-\n\x0bHeaderEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x85\x01\n%com.xray.transport.internet.websocketP\x01Z6github.com/xtls/xray-core/transport/internet/websocket\xaa\x02!Xray.Transport.Internet.Websocketb\x06proto3') -_HEADER = DESCRIPTOR.message_types_by_name['Header'] _CONFIG = DESCRIPTOR.message_types_by_name['Config'] -Header = _reflection.GeneratedProtocolMessageType('Header', (_message.Message,), { - 'DESCRIPTOR' : _HEADER, - '__module__' : 'transport.internet.websocket.config_pb2' - # @@protoc_insertion_point(class_scope:xray.transport.internet.websocket.Header) - }) -_sym_db.RegisterMessage(Header) - +_CONFIG_HEADERENTRY = _CONFIG.nested_types_by_name['HeaderEntry'] Config = _reflection.GeneratedProtocolMessageType('Config', (_message.Message,), { + + 'HeaderEntry' : _reflection.GeneratedProtocolMessageType('HeaderEntry', (_message.Message,), { + 'DESCRIPTOR' : _CONFIG_HEADERENTRY, + '__module__' : 'transport.internet.websocket.config_pb2' + # @@protoc_insertion_point(class_scope:xray.transport.internet.websocket.Config.HeaderEntry) + }) + , 'DESCRIPTOR' : _CONFIG, '__module__' : 'transport.internet.websocket.config_pb2' # @@protoc_insertion_point(class_scope:xray.transport.internet.websocket.Config) }) _sym_db.RegisterMessage(Config) +_sym_db.RegisterMessage(Config.HeaderEntry) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n%com.xray.transport.internet.websocketP\001Z6github.com/xtls/xray-core/transport/internet/websocket\252\002!Xray.Transport.Internet.Websocket' - _HEADER._serialized_start=80 - _HEADER._serialized_end=116 - _CONFIG._serialized_start=119 - _CONFIG._serialized_end=249 + _CONFIG_HEADERENTRY._options = None + _CONFIG_HEADERENTRY._serialized_options = b'8\001' + _CONFIG._serialized_start=81 + _CONFIG._serialized_end=278 + _CONFIG_HEADERENTRY._serialized_start=233 + _CONFIG_HEADERENTRY._serialized_end=278 # @@protoc_insertion_point(module_scope) diff --git a/xray_api/types/account.py b/xray_api/types/account.py index 5f873a43..a07cedec 100755 --- a/xray_api/types/account.py +++ b/xray_api/types/account.py @@ -32,7 +32,7 @@ class VMessAccount(Account): @property def message(self): - return Message(VMessAccountPb2(id=str(self.id), alter_id=0)) + return Message(VMessAccountPb2(id=str(self.id))) class XTLSFlows(Enum): @@ -55,7 +55,7 @@ class TrojanAccount(Account): @property def message(self): - return Message(TrojanAccountPb2(password=self.password, flow=self.flow.value)) + return Message(TrojanAccountPb2(password=self.password)) class ShadowsocksMethods(Enum):