Update Version

Author: Jrohy

README.md

@@ -55,7 +55,8 @@ V2ray/Xray多用户管理脚本，向导式管理[新增|删除|修改]传输协
   - MTProto
   - Shadowsocks
   - Quic
-  - VLESS
+  - VLESS_TCP
+  - VLESS_TLS
   - VLESS_WS
   - VLESS_XTLS
   - Trojan

README_EN.md

@@ -36,7 +36,8 @@ a tool to manage v2ray/xray config json, support multiple user && group manage
   - MTProto
   - Shadowsocks
   - Quic
-  - VLESS
+  - VLESS_TCP
+  - VLESS_TLS
   - VLESS_WS
   - VLESS_XTLS
   - Trojan

v2ray

@@ -1,7 +1,7 @@
 # bash completion for v2ray/xray
 function _auto_tab() {
 	local options_array=("start" "stop" "restart" "status" "update" "update.sh" "add" "del" "info" "port" "tls" "tfo" "stream" "iptables" "cdn" "stats" "clean" "log" "new" "rm" "-h" "-v" "help" "version")
-	local add_array=("wechat" "utp" "srtp" "dtls" "wireguard" "socks" "mtproto" "ss" "vless" "vless_ws" "vless_xtls" "trojan" "ss" "quic" "h2" "tcp" "tcp_host" "ws")
+	local add_array=("wechat" "utp" "srtp" "dtls" "wireguard" "socks" "mtproto" "ss" "vless_tcp" "vless_tls" "vless_ws" "vless_xtls" "trojan" "ss" "quic" "h2" "tcp" "tcp_host" "ws")
 	local log_array=("access" "a" "error" "e")
 	local cur prev
 

v2ray_util/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.9.1'
+__version__ = '3.9.2'
 
 import sys
 if "xray" in sys.argv[0]:

v2ray_util/config_modify/stream.py

@@ -28,7 +28,8 @@ def __init__(self, group_tag='A', group_index=-1):
             (StreamType.MTPROTO, "MTProto"), 
             (StreamType.SS, "Shadowsocks"),
             (StreamType.QUIC, "Quic"),
-            (StreamType.VLESS, "VLESS"),
+            (StreamType.VLESS_TCP, "VLESS_TCP"),
+            (StreamType.VLESS_TLS, "VLESS_TLS"),
             (StreamType.VLESS_WS, "VLESS_WS"),
             (StreamType.VLESS_XTLS, "VLESS_XTLS"),
             (StreamType.TROJAN, "Trojan"),
@@ -66,7 +67,7 @@ def select(self, sType):
             print("")
             header = CommonSelector(header_type_list(), _("please select fake header: ")).select()
             kw = {'security': security, 'key': key, 'header': header}
-        elif sType in (StreamType.VLESS, StreamType.VLESS_WS, StreamType.VLESS_XTLS):
+        elif sType in (StreamType.VLESS_TLS, StreamType.VLESS_WS, StreamType.VLESS_XTLS):
             port_set = all_port()
             if not "443" in port_set:
                 print()

v2ray_util/util_core/utils.py

@@ -67,7 +67,8 @@ class StreamType(Enum):
     KCP_DTLS = 'dtls'
     KCP_WECHAT = 'wechat'
     KCP_WG = 'wireguard'
-    VLESS = 'vless'
+    VLESS_TCP = 'vless_tcp'
+    VLESS_TLS = 'vless_tls'
     VLESS_WS = 'vless_ws'
     VLESS_XTLS = 'vless_xtls'
     TROJAN = 'trojan'

v2ray_util/util_core/writer.py

@@ -117,13 +117,15 @@ def write(self, **kw):
         elif self.part_json['protocol'] == 'socks':
             origin_protocol = StreamType.SOCKS
         elif self.part_json['protocol'] == 'vless':
-            origin_protocol = StreamType.VLESS
+            if self.part_json["streamSettings"]["security"] == "xtls":
+                origin_protocol = StreamType.VLESS_XTLS
+            elif self.part_json["streamSettings"]["security"] == "tls":
+                origin_protocol = StreamType.VLESS_TLS
+            else:
+                origin_protocol = StreamType.VLESS_TCP
         elif self.part_json['protocol'] == 'trojan':
             origin_protocol = StreamType.TROJAN
 
-        if origin_protocol == StreamType.VLESS and self.part_json["streamSettings"]["security"] == "xtls":
-            origin_protocol = StreamType.VLESS_XTLS
-
         if origin_protocol != StreamType.MTPROTO and origin_protocol != StreamType.SS:
             security_backup = self.part_json["streamSettings"]["security"]
             if origin_protocol == StreamType.VLESS_XTLS:
@@ -138,7 +140,7 @@ def write(self, **kw):
             clean_mtproto_tag(self.config, self.group_index)
 
         #原来是socks/mtproto/shadowsocks/vless/trojan/xtls协议 则先切换为标准的inbound
-        if origin_protocol in (StreamType.MTPROTO, StreamType.SOCKS, StreamType.SS, StreamType.VLESS, StreamType.TROJAN, StreamType.VLESS_XTLS):
+        if origin_protocol in (StreamType.MTPROTO, StreamType.SOCKS, StreamType.SS, StreamType.VLESS_TLS, StreamType.VLESS_TCP, StreamType.TROJAN, StreamType.VLESS_XTLS):
             vmess = self.load_template('server.json')
             vmess["inbounds"][0]["port"] = self.part_json["port"]
             if "allocate" in self.part_json:
@@ -213,7 +215,7 @@ def write(self, **kw):
                 ws["wsSettings"]["headers"]["Host"] = kw['host']
             self.part_json["streamSettings"] = ws
 
-        elif self.stream_type in (StreamType.VLESS, StreamType.VLESS_XTLS, StreamType.VLESS_WS):
+        elif self.stream_type in (StreamType.VLESS_TCP, StreamType.VLESS_TLS, StreamType.VLESS_XTLS, StreamType.VLESS_WS):
             vless = self.load_template('vless.json')
             vless["clients"][0]["id"] = str(uuid.uuid1())
             if self.stream_type == StreamType.VLESS_XTLS:
@@ -233,16 +235,17 @@ def write(self, **kw):
             self.save()
             alpn = ["http/1.1"]
             # tls的设置
-            if not "certificates" in tls_settings_backup:
-                from ..config_modify.tls import TLSModifier
-                if self.stream_type == StreamType.VLESS_XTLS:
-                    tm = TLSModifier(self.group_tag, self.group_index, alpn=alpn, xtls=True)
-                else:
-                    tm = TLSModifier(self.group_tag, self.group_index, alpn=alpn)
-                tm.turn_on(False)
-                return
-            elif not "alpn" in tls_settings_backup:
-                tls_settings_backup["alpn"] = alpn
+            if self.stream_type != StreamType.VLESS_TCP:
+                if not "certificates" in tls_settings_backup:
+                    from ..config_modify.tls import TLSModifier
+                    if self.stream_type == StreamType.VLESS_XTLS:
+                        tm = TLSModifier(self.group_tag, self.group_index, alpn=alpn, xtls=True)
+                    else:
+                        tm = TLSModifier(self.group_tag, self.group_index, alpn=alpn)
+                    tm.turn_on(False)
+                    return
+                elif not "alpn" in tls_settings_backup:
+                    tls_settings_backup["alpn"] = alpn
 
         elif self.stream_type == StreamType.TROJAN:
             self.part_json['protocol'] = "trojan"
@@ -296,7 +299,8 @@ def write(self, **kw):
         if domain:
             self.part_json["domain"] = domain
 
-        if origin_protocol in (StreamType.VLESS, StreamType.TROJAN, StreamType.VLESS_XTLS) and self.stream_type not in (StreamType.VLESS, StreamType.TROJAN, StreamType.VLESS_XTLS):
+        apln_list = (StreamType.VLESS_TLS, StreamType.VLESS_TCP, StreamType.TROJAN, StreamType.VLESS_XTLS)
+        if origin_protocol in apln_list and self.stream_type not in apln_list:
             if "alpn" in self.part_json["streamSettings"]["tlsSettings"]:
                 del self.part_json["streamSettings"]["tlsSettings"]["alpn"]