Merge pull request #45 from SonyaCore/update-1.1.5

Update 1.1.5

Author: SonyaCore

README.md

@@ -8,35 +8,36 @@
 
 </h1>
 
-<h3>
-<strong>V2RayGen / XRayGen</strong> is a fully automated script that helps you to set up your own Xray server in the fastest time.
-</h3>
+<h3><strong>V2RayGen/XRayGen</strong>: A Fast and Automated Script for XRay/V2Ray Server Setup</h3>
 
 [**Usage**](#usage)
 
 [**Quick Setup**](#quicksetup)
 
 [**Examples**](#examples)
 
-[**Options ⚙️**](#options)
+[**Options**](#options)
 
-[**License 🪪**](#license)
+[**License**](#license)
 
-[**Donate Me ☕**](#donateme)
+[**Donate Me**](#donateme)
 
 ## **Prerequisites & Dependencies**
 
-For running this script, you must have **docker**, **docker-compose** and **python3** on your server **but** this script installs `docker` & `docker-compose` if your server doesn't have docker and runs xray-core automatically
+- `Python3`
+- `Docker`
+- `Docker Compose`
+<p>If your server lacks Docker and Docker-Compose, the script will install them and launch XRay-Core automatically.</p>
 
 use **sudo** if your current user is not in the docker group or you don't have docker installed
 
-## **How XRayGen Works ?**
+## **How Does XRayGen Work?**
 
-`XRayGen` uses docker to pull XRay image from the docker registry and after that, it generates a configuration file to start XRay container.
+<p>XRayGen uses Docker to retrieve the xray-core image from the Docker registry. It then generates a configuration file to launch the XRay container.
 
-it also creates a client side configuration file so you can use that with xray-core or v2ray-core.
+A client-side configuration file is also created for use with XRay-core or V2Ray-core.
 
-There is also `XRayAgent` for User Management on XRay Configuration which can be used for CRUD operations.
+The XRayAgent provides user management for XRay configuration, offering CRUD operations.</p>
 
 ## **Usage**
 
@@ -50,11 +51,12 @@ There is also `XRayAgent` for User Management on XRay Configuration which can be
 
 You can use one of the following protocols for installation and change its settings according to your needs.
 
-| Protoctol   | Argument      |
-| ----------- | ------------- |
-| VMESS       | --vmess , -wm |
-| VMESS + TLS | --vmess --tls |
-| VLESS + TLS | --vless , -vl |
+| Protoctol    | Argument       |
+| ------------ | -------------- |
+| VMESS        | --vmess , -wm  |
+| VMESS + TLS  | --vmess --tls  |
+| VLESS + TLS  | --vless , -vl  |
+| VLESS + XTLS | --vless --xtls |
 
 ### **Quick `Xray` Setup with Default Setting** :
 
@@ -127,6 +129,12 @@ VLESS + Using Google DNS :
 curl https://raw.githubusercontent.com/SonyaCore/V2RayGen/main/V2RayGen.py | sudo python3 - --vless --dns google
 ```
 
+VLESS + XTLS :
+
+```bash
+curl https://raw.githubusercontent.com/SonyaCore/V2RayGen/main/V2RayGen.py | sudo python3 - --vless --xtls
+```
+
 ShadowSocks + adding shadowsocks port to server :
 
 ```bash
@@ -153,10 +161,14 @@ curl https://raw.githubusercontent.com/SonyaCore/V2RayGen/main/V2RayGen.py | pyt
 
 XRayAgent is a Simple User Management for XRay Configuration
 
-> XRayAgent takes user input so you have to download that to your server and then running it
-
 ### Download Script & Run With Python3:
 
+```bash
+curl https://raw.githubusercontent.com/SonyaCore/V2RayGen/main/V2RayGen.py --output /tmp/v.py && python3 /tmp/v.py --agent
+```
+
+OR
+
 ```bash
 curl https://raw.githubusercontent.com/SonyaCore/V2RayGen/main/XRayAgent.py --output XRayAgent.py
 python3 XRayAgent.py
@@ -303,6 +315,12 @@ none : Nothing will be printed.
 >
 > `it's important to enable allow insecure tls on your client`
 
+`xtls` Using XTLS in specified protocol
+
+> XTLS only supports (TCP, mKCP) so by default when you use --xtls argument tcp mode is being used for vless
+>
+> also xtls doesn't support vmess protocol
+
 `port` for changing configuration port.
 
 > if you want your v2ray to be listening on a different port use this option

V2RayGen.py

@@ -18,6 +18,7 @@
 import string
 import csv
 import re
+import platform
 import ipaddress
 from urllib.parse import unquote
 from urllib.request import urlopen, Request
@@ -31,7 +32,7 @@
 NAME = "XRayGen"
 
 # Version
-VERSION = "1.1.4"
+VERSION = "1.1.5"
 
 # UUID Generation
 UUID = uuid.uuid4()
@@ -58,6 +59,10 @@
 SOCKSPORT = 10808
 HTTPPORT = 10809
 
+## AGENT
+AGENT_URL = "https://raw.githubusercontent.com/SonyaCore/V2RayGen/main/XRayAgent.py"
+AGENT_PATH = "/tmp/agent.py"
+
 # -------------------------------- Colors --------------------------------- #
 
 # Color Format
@@ -86,6 +91,8 @@ def str2bool(v):
 
 
 parser.add_argument("--config", "-c", action="store_true", help="Creating only the Configuration file")
+parser.add_argument("--agent", "-a", action="store_true", help="Launch XRayAgent")
+
 
 quick = parser.add_argument_group(f"{green}Protocols{reset}")
 
@@ -125,6 +132,10 @@ def str2bool(v):
 inboundsparser.add_argument(
     "--tls", "-t", action="store_true", help="Using TLS in specified protocol"
 )
+inboundsparser.add_argument(
+    "--xtls", "-xt", action="store_true", help="Using XTLS in specified protocol"
+)
+
 
 inboundsparser.add_argument(
     "--port",
@@ -562,6 +573,14 @@ def create_key():
     print(reset)
 
 
+def clearcmd() -> None:
+    version = platform.system()
+    if version in ("Linux", "Darwin"):
+        subprocess.run("clear")
+    elif version == "Windows":
+        subprocess.run("cls")
+
+
 # def websocket_domaincheck(url = args.domain,t = 10) :
 #     """
 #     when using the domain for WebSocket the status code should be 400
@@ -655,7 +674,9 @@ def xray_make():
 
     print(blue + f"! {name} Config Generated." + reset)
     if args.vless:
-        print(yellow + f"! By default TLS is being used for this Protocol" + reset)
+        print(
+            "{}! By default TLS is being used for this Protocol{}".format(yellow, reset)
+        )
 
 
 def xray_config(outband, protocol) -> str:
@@ -664,17 +685,22 @@ def xray_config(outband, protocol) -> str:
     """
     global NETSTREAM
 
+    if args.xtls:
+        print(
+            "{}! XTLS only supports (TCP,mKCP). Using TCP mode{}".format(yellow, reset)
+        )
+
     if args.http:
         networkstream = http()
         NETSTREAM = "HTTP"
-    elif args.tcp or args.shadowsocks:
+    elif args.tcp or args.shadowsocks or args.xtls:
         networkstream = tcp()
         NETSTREAM = "TCP"
     else:
         networkstream = websocket_config(args.wspath)
         NETSTREAM = "WebSocket"
 
-    if args.tcp or args.shadowsocks:
+    if args.tcp or args.shadowsocks or args.xtls:
         # TCP stream settings
         streamsettings = """
         "streamSettings": {
@@ -989,9 +1015,16 @@ def tlssettings() -> str:
     """
     tls security settings for protocols with tls
     """
+    if args.xtls:
+        server_security = "xtls"
+        tls_server_type = "xtlsSettings"
+    else:
+        server_security = "tls"
+        tls_server_type = "tlsSettings"
+
     tls = """
-    "security": "tls",    
-    "tlsSettings": {
+    "security": "%s",    
+    "%s": {
           "alpn": ["http/1.1"],
           "certificates": [
             {
@@ -1000,6 +1033,8 @@ def tlssettings() -> str:
             }
           ]
         }""" % (
+        server_security,
+        tls_server_type,
         crtkey,
         hostkey,
     )
@@ -1377,20 +1412,30 @@ def client_side_configuration(protocol):
         HTTPPORT,
     )
 
+    if args.xtls:
+        tls_client_type = "xtlsSettings"
+        security = "xtls"
+    else:
+        tls_client_type = "tlsSettings"
+        security = "tls"
+
     tls_client = """
-        "security": "tls",
-        "tlsSettings": {
+        "security": "%s",
+        "%s": {
           "allowInsecure": true,
           "alpn": [
             "http/1.1"
           ],
           "fingerprint": ""
         }
-        """
+        """ % (
+        security,
+        tls_client_type,
+    )
 
     if args.http:
         network = "http"
-    elif args.tcp or args.shadowsocks:
+    elif args.tcp or args.shadowsocks or args.xtls:
         network = "tcp"
     else:
         network = "websocket"
@@ -2143,17 +2188,17 @@ def shadowsocks_check():
 
     if args.ssmethod not in methodlist:
         print("Select one method :")
-        print("{}XRay Ciphers :{}".format(yellow,reset))
+        print("{}XRay Ciphers :{}".format(yellow, reset))
 
         for xmethods in range(len(xraymethod)):
             print(green + xraymethod[xmethods] + reset)
 
-        print("{}V2ray Ciphers : {}".format(yellow,reset))
+        print("{}V2ray Ciphers : {}".format(yellow, reset))
         for vmethods in range(len(v2raymethod)):
             print(green + v2raymethod[vmethods] + reset)
         sys.exit(2)
 
-    elif args.ssmethod in (methodlist[0:2] , methodlist[-1]):
+    elif args.ssmethod in (methodlist[0:2], methodlist[-1]):
         print(
             "{}{} are only useable in xray-core{}".format(yellow, args.ssmethod, reset)
         )
@@ -2197,6 +2242,14 @@ def base_error(err):
 
     user_permission()
 
+    if args.agent:
+        clearcmd()
+        subprocess_command = "curl -s {url} --output {path} && python3 {path}".format(
+            url=AGENT_URL, path=AGENT_PATH
+        )
+        subprocess.run(subprocess_command, check=True, shell=True)
+        os.remove(AGENT_PATH)
+
     # install bbr
     if args.bbr:
         install_bbr()
@@ -2298,7 +2351,13 @@ def base_error(err):
         args.outbound = "both"
 
     # link security method
-    if args.tls or args.vless:
+    if args.tls:
+        TLSTYPE = "tls"
+
+    elif args.xtls:
+        TLSTYPE = "xtls"
+
+    elif args.vless:
         TLSTYPE = "tls"
 
     if args.http:
@@ -2311,6 +2370,11 @@ def base_error(err):
         path = "/"
         header = "http"
 
+    elif args.vless and args.xtls:
+        net = "tcp"
+        path = "/"
+        header = "http"
+
     else:
         net = "ws"
         path = args.wspath
@@ -2324,6 +2388,12 @@ def base_error(err):
     if args.linkname == None:
         args.linkname = linkname
 
+    if args.vmess and args.xtls:
+        sys.exit("{}! XTLS doesn't supports VMess for now.{}".format(error, reset))
+
+    if args.http and args.xtls:
+        sys.exit("{}! XTLS doesn't supports HTTP mode{}".format(error, reset))
+
     # Quick VMess Setup
     if all((args.vmess, args.tls)):
         xray_create("VMESSTLS")