Merge cd90174a64 into f87c68ea68

Adds a scheduled GitHub Actions workflow (.github/workflows/cleanup_caches.yml) that runs weekly (and via workflow_dispatch) to delete Actions caches not accessed in the last 3 days. The job uses the gh CLI with the repository token and actions: write permission to list caches, filter by last_accessed_at against a 3-day cutoff, and delete matching cache IDs.

.github/workflows/cleanup_caches.yml

@@ -0,0 +1,31 @@
+name: Cleanup Caches
+on:
+  schedule:
+    - cron: '0 3 * * 0'   # every Sunday
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Delete caches older than 3 days
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          CUTOFF_DATE=$(date -d "3 days ago" -Ins --utc | sed 's/+0000/Z/')
+          echo "Deleting caches older than: $CUTOFF_DATE"
+          
+          CACHE_IDS=$(gh api --paginate repos/${{ github.repository }}/actions/caches \
+            --jq ".actions_caches[] | select(.last_accessed_at < \"$CUTOFF_DATE\") | .id" 2>/dev/null)
+          
+          if [ -z "$CACHE_IDS" ]; then
+            echo "No old caches found to delete."
+          else
+            echo "$CACHE_IDS" | while read CACHE_ID; do
+              echo "Deleting cache: $CACHE_ID"
+              gh api -X DELETE repos/${{ github.repository }}/actions/caches/$CACHE_ID
+            done
+            echo "Old caches deleted successfully."
+          fi

.github/workflows/release.yml

@@ -89,7 +89,7 @@ jobs:
           cd x-ui/bin
           
           # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v26.1.31/"
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v26.2.2/"
           if [ "${{ matrix.platform }}" == "amd64" ]; then
             wget -q ${Xray_URL}Xray-linux-64.zip
             unzip Xray-linux-64.zip
@@ -173,21 +173,42 @@ jobs:
           go-version-file: go.mod
           check-latest: true
 
-      - name: Build 3X-UI for Windows
+      - name: Install MSYS2
-        shell: pwsh
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: >-
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-sqlite3
+            mingw-w64-x86_64-pkg-config
+
+      - name: Build 3X-UI for Windows (CGO)
+        shell: msys2 {0}
         run: |
-          $env:CGO_ENABLED="1"
+          export PATH="/c/hostedtoolcache/windows/go/$(ls /c/hostedtoolcache/windows/go | sort -V | tail -n1)/x64/bin:$PATH"
-          $env:GOOS="windows"
+
-          $env:GOARCH="amd64"
+          export CGO_ENABLED=1
+          export GOOS=windows
+          export GOARCH=amd64
+          export CC=x86_64-w64-mingw32-gcc
+
+          which go
+          go version
+          gcc --version
+
           go build -ldflags "-w -s" -o xui-release.exe -v main.go
 
+      - name: Copy and download resources
+        shell: pwsh
+        run: |
           mkdir x-ui
-          Copy-Item xui-release.exe x-ui\
+          Copy-Item xui-release.exe x-ui\x-ui.exe
           mkdir x-ui\bin
           cd x-ui\bin
           
           # Download Xray for Windows
-          $Xray_URL = "https://github.com/XTLS/Xray-core/releases/download/v26.1.31/"
+          $Xray_URL = "https://github.com/XTLS/Xray-core/releases/download/v26.2.2/"
           Invoke-WebRequest -Uri "${Xray_URL}Xray-windows-64.zip" -OutFile "Xray-windows-64.zip"
           Expand-Archive -Path "Xray-windows-64.zip" -DestinationPath .
           Remove-Item "Xray-windows-64.zip"

DockerInit.sh

@@ -27,7 +27,7 @@ case $1 in
 esac
 mkdir -p build/bin
 cd build/bin
-curl -sfLRO "https://github.com/XTLS/Xray-core/releases/download/v26.1.31/Xray-linux-${ARCH}.zip"
+curl -sfLRO "https://github.com/XTLS/Xray-core/releases/download/v26.2.2/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat
 mv xray "xray-linux-${FNAME}"

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/valyala/fasthttp v1.69.0
 	github.com/xlzd/gotp v0.1.0
-	github.com/xtls/xray-core v1.260131.0
+	github.com/xtls/xray-core v1.260202.0
 	go.uber.org/atomic v1.11.0
 	golang.org/x/crypto v0.47.0
 	golang.org/x/sys v0.40.0
@@ -40,7 +40,7 @@ require (
 	github.com/cloudflare/circl v1.6.3 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/ebitengine/purego v0.9.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect

go.sum

@@ -23,8 +23,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
 github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
+github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=
-github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/gin-contrib/gzip v1.2.5 h1:fIZs0S+l17pIu1P5XRJOo/YNqfIuPCrZZ3TWB7pjckI=
@@ -195,8 +195,8 @@ github.com/xlzd/gotp v0.1.0 h1:37blvlKCh38s+fkem+fFh7sMnceltoIEBYTVXyoa5Po=
 github.com/xlzd/gotp v0.1.0/go.mod h1:ndLJ3JKzi3xLmUProq4LLxCuECL93dG9WASNLpHz8qg=
 github.com/xtls/reality v0.0.0-20251116175510-cd53f7d50237 h1:UXjrmniKlY+ZbIqpN91lejB3pszQQQRVu1vqH/p/aGM=
 github.com/xtls/reality v0.0.0-20251116175510-cd53f7d50237/go.mod h1:vbHCV/3VWUvy1oKvTxxWJRPEWSeR1sYgQHIh6u/JiZQ=
-github.com/xtls/xray-core v1.260131.0 h1:gPBykLhUvRZ8sfubNerkwWqV3c15UtmSYQG2cgKqrV4=
+github.com/xtls/xray-core v1.260202.0 h1:dYduYxGlkn/krSQJbmksbTtCdRe8OFb3YwpuXXEJG5c=
-github.com/xtls/xray-core v1.260131.0/go.mod h1:cxzYFZrxu1B1NtPjHsqv4UzgDvRA71mV4rXYH4KtO7Q=
+github.com/xtls/xray-core v1.260202.0/go.mod h1:cxzYFZrxu1B1NtPjHsqv4UzgDvRA71mV4rXYH4KtO7Q=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=

sub/subController.go

@@ -3,8 +3,8 @@ package sub
 import (
 	"encoding/base64"
 	"fmt"
-	"strings"
 	"strconv"
+	"strings"
 
 	"github.com/mhsanaei/3x-ui/v2/config"
 
@@ -64,8 +64,8 @@ func NewSUBController(
 		subEncrypt:       encrypt,
 		updateInterval:   update,
 
-		subService:       sub,
+		subService:     sub,
-		subJsonService:   NewSubJsonService(jsonFragment, jsonNoise, jsonMux, jsonRules, sub),
+		subJsonService: NewSubJsonService(jsonFragment, jsonNoise, jsonMux, jsonRules, sub),
 	}
 	a.initRouter(g)
 	return a

web/assets/js/model/inbound.js

@@ -967,7 +967,7 @@ class SockoptStreamSettings extends XrayCommonClass {
     }
 }
 
-class FinalMask extends XrayCommonClass {
+class UdpMask extends XrayCommonClass {
     constructor(type = 'salamander', settings = {}) {
         super();
         this.type = type;
@@ -982,6 +982,8 @@ class FinalMask extends XrayCommonClass {
             case 'header-dns':
             case 'xdns':
                 return { domain: settings.domain || '' };
+            case 'xicmp':
+                return { ip: settings.ip || '', id: settings.id ?? 0 };
             case 'mkcp-original':
             case 'header-dtls':
             case 'header-srtp':
@@ -995,20 +997,35 @@ class FinalMask extends XrayCommonClass {
     }
 
     static fromJson(json = {}) {
-        return new FinalMask(
+        return new UdpMask(
             json.type || 'salamander',
             json.settings || {}
         );
     }
 
     toJson() {
-        const result = {
+        return {
-            type: this.type
+            type: this.type,
+            settings: (this.settings && Object.keys(this.settings).length > 0) ? this.settings : undefined
         };
-        if (this.settings && Object.keys(this.settings).length > 0) {
+    }
-            result.settings = this.settings;
+}
-        }
+
-        return result;
+class FinalMaskStreamSettings extends XrayCommonClass {
+    constructor(udp = []) {
+        super();
+        this.udp = Array.isArray(udp) ? udp.map(u => new UdpMask(u.type, u.settings)) : [new UdpMask(udp.type, udp.settings)];
+    }
+
+    static fromJson(json = {}) {
+        return new FinalMaskStreamSettings(json.udp || []);
+    }
+
+    toJson() {
+        return {
+            udp: this.udp.map(udp => udp.toJson())
+        };
+
     }
 }
 
@@ -1024,7 +1041,7 @@ class StreamSettings extends XrayCommonClass {
         grpcSettings = new GrpcStreamSettings(),
         httpupgradeSettings = new HTTPUpgradeStreamSettings(),
         xhttpSettings = new xHTTPStreamSettings(),
-        finalmask = { udp: [] },
+        finalmask = new FinalMaskStreamSettings(),
         sockopt = undefined,
     ) {
         super();
@@ -1044,10 +1061,7 @@ class StreamSettings extends XrayCommonClass {
     }
 
     addUdpMask(type = 'salamander') {
-        if (!this.finalmask.udp) {
+        this.finalmask.udp.push(new UdpMask(type));
-            this.finalmask.udp = [];
-        }
-        this.finalmask.udp.push(new FinalMask(type));
     }
 
     delUdpMask(index) {
@@ -1056,6 +1070,10 @@ class StreamSettings extends XrayCommonClass {
         }
     }
 
+    get hasFinalMask() {
+        return this.finalmask.udp && this.finalmask.udp.length > 0;
+    }
+
     get isTls() {
         return this.security === "tls";
     }
@@ -1090,14 +1108,6 @@ class StreamSettings extends XrayCommonClass {
     }
 
     static fromJson(json = {}) {
-        let finalmask = { udp: [] };
-        if (json.finalmask) {
-            if (Array.isArray(json.finalmask)) {
-                finalmask.udp = json.finalmask.map(mask => FinalMask.fromJson(mask));
-            } else if (json.finalmask.udp) {
-                finalmask.udp = json.finalmask.udp.map(mask => FinalMask.fromJson(mask));
-            }
-        }
         return new StreamSettings(
             json.network,
             json.security,
@@ -1110,7 +1120,7 @@ class StreamSettings extends XrayCommonClass {
             GrpcStreamSettings.fromJson(json.grpcSettings),
             HTTPUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
             xHTTPStreamSettings.fromJson(json.xhttpSettings),
-            finalmask,
+            FinalMaskStreamSettings.fromJson(json.finalmask),
             SockoptStreamSettings.fromJson(json.sockopt),
         );
     }
@@ -1129,9 +1139,7 @@ class StreamSettings extends XrayCommonClass {
             grpcSettings: network === 'grpc' ? this.grpc.toJson() : undefined,
             httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
             xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
-            finalmask: (this.finalmask.udp && this.finalmask.udp.length > 0) ? {
+            finalmask: this.hasFinalMask ? this.finalmask.toJson() : undefined,
-                udp: this.finalmask.udp.map(mask => mask.toJson())
-            } : undefined,
             sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
         };
     }
@@ -1302,14 +1310,6 @@ class Inbound extends XrayCommonClass {
         return null;
     }
 
-    get kcpType() {
-        return this.stream.kcp.type;
-    }
-
-    get kcpSeed() {
-        return this.stream.kcp.seed;
-    }
-
     get serviceName() {
         return this.stream.grpc.serviceName;
     }
@@ -1386,8 +1386,6 @@ class Inbound extends XrayCommonClass {
             }
         } else if (network === 'kcp') {
             const kcp = this.stream.kcp;
-            obj.type = kcp.type;
-            obj.path = kcp.seed;
         } else if (network === 'ws') {
             const ws = this.stream.ws;
             obj.path = ws.path;
@@ -1450,8 +1448,6 @@ class Inbound extends XrayCommonClass {
                 break;
             case "kcp":
                 const kcp = this.stream.kcp;
-                params.set("headerType", kcp.type);
-                params.set("seed", kcp.seed);
                 break;
             case "ws":
                 const ws = this.stream.ws;
@@ -1555,8 +1551,6 @@ class Inbound extends XrayCommonClass {
                 break;
             case "kcp":
                 const kcp = this.stream.kcp;
-                params.set("headerType", kcp.type);
-                params.set("seed", kcp.seed);
                 break;
             case "ws":
                 const ws = this.stream.ws;
@@ -1636,8 +1630,6 @@ class Inbound extends XrayCommonClass {
                 break;
             case "kcp":
                 const kcp = this.stream.kcp;
-                params.set("headerType", kcp.type);
-                params.set("seed", kcp.seed);
                 break;
             case "ws":
                 const ws = this.stream.ws;

web/assets/js/model/outbound.js

@@ -568,7 +568,7 @@ class SockoptStreamSettings extends CommonClass {
     }
 }
 
-class FinalMask extends CommonClass {
+class UdpMask extends CommonClass {
     constructor(type = 'salamander', settings = {}) {
         super();
         this.type = type;
@@ -596,21 +596,35 @@ class FinalMask extends CommonClass {
     }
 
     static fromJson(json = {}) {
-        return new FinalMask(
+        return new UdpMask(
             json.type || 'salamander',
             json.settings || {}
         );
     }
 
     toJson() {
-        const result = {
+        return {
-            type: this.type
+            type: this.type,
+            settings: (this.settings && Object.keys(this.settings).length > 0) ? this.settings : undefined
         };
-        // Only include settings if they exist and are not empty
+    }
-        if (this.settings && Object.keys(this.settings).length > 0) {
+}
-            result.settings = this.settings;
+
-        }
+class FinalMaskStreamSettings extends CommonClass {
-        return result;
+    constructor(udp = []) {
+        super();
+        this.udp = Array.isArray(udp) ? udp.map(u => new UdpMask(u.type, u.settings)) : [new UdpMask(udp.type, udp.settings)];
+    }
+
+    static fromJson(json = {}) {
+        return new FinalMaskStreamSettings(json.udp || []);
+    }
+
+    toJson() {
+        return {
+            udp: this.udp.map(udp => udp.toJson())
+        };
+
     }
 }
 
@@ -627,7 +641,7 @@ class StreamSettings extends CommonClass {
         httpupgradeSettings = new HttpUpgradeStreamSettings(),
         xhttpSettings = new xHTTPStreamSettings(),
         hysteriaSettings = new HysteriaStreamSettings(),
-        finalmask = { udp: [] },
+        finalmask = new FinalMaskStreamSettings(),
         sockopt = undefined,
     ) {
         super();
@@ -647,10 +661,7 @@ class StreamSettings extends CommonClass {
     }
 
     addUdpMask(type = 'salamander') {
-        if (!this.finalmask.udp) {
+        this.finalmask.udp.push(new UdpMask(type));
-            this.finalmask.udp = [];
-        }
-        this.finalmask.udp.push(new FinalMask(type));
     }
 
     delUdpMask(index) {
@@ -659,6 +670,10 @@ class StreamSettings extends CommonClass {
         }
     }
 
+    get hasFinalMask() {
+        return this.finalmask.udp && this.finalmask.udp.length > 0;
+    }
+
     get isTls() {
         return this.security === 'tls';
     }
@@ -676,16 +691,6 @@ class StreamSettings extends CommonClass {
     }
 
     static fromJson(json = {}) {
-        let finalmask = { udp: [] };
-        if (json.finalmask) {
-            if (Array.isArray(json.finalmask)) {
-                // Legacy format: direct array (backward compatibility)
-                finalmask.udp = json.finalmask.map(mask => FinalMask.fromJson(mask));
-            } else if (json.finalmask.udp) {
-                // New format: object with udp array
-                finalmask.udp = json.finalmask.udp.map(mask => FinalMask.fromJson(mask));
-            }
-        }
         return new StreamSettings(
             json.network,
             json.security,
@@ -698,7 +703,7 @@ class StreamSettings extends CommonClass {
             HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
             xHTTPStreamSettings.fromJson(json.xhttpSettings),
             HysteriaStreamSettings.fromJson(json.hysteriaSettings),
-            finalmask,
+            FinalMaskStreamSettings.fromJson(json.finalmask),
             SockoptStreamSettings.fromJson(json.sockopt),
         );
     }
@@ -717,9 +722,7 @@ class StreamSettings extends CommonClass {
             httpupgradeSettings: network === 'httpupgrade' ? this.httpupgrade.toJson() : undefined,
             xhttpSettings: network === 'xhttp' ? this.xhttp.toJson() : undefined,
             hysteriaSettings: network === 'hysteria' ? this.hysteria.toJson() : undefined,
-            finalmask: (this.finalmask.udp && this.finalmask.udp.length > 0) ? {
+            finalmask: this.hasFinalMask ? this.finalmask.toJson() : undefined,
-                udp: this.finalmask.udp.map(mask => mask.toJson())
-            } : undefined,
             sockopt: this.sockopt != undefined ? this.sockopt.toJson() : undefined,
         };
     }

web/html/form/stream/stream_finalmask.html

@@ -45,6 +45,9 @@
                     <a-select-option v-if="inbound.stream.network === 'kcp'"
                         value="mkcp-original">
                         mKCP Original</a-select-option>
+                    <a-select-option v-if="inbound.stream.network === 'kcp'"
+                        value="xicmp">
+                        xICMP (Experimental)</a-select-option>
                     <!-- xDNS for TCP/WS/HTTPUpgrade/XHTTP -->
                     <a-select-option
                         v-if="['tcp', 'ws', 'httpupgrade', 'xhttp'].includes(inbound.stream.network)"
@@ -64,6 +67,17 @@
                 <a-input v-model.trim="mask.settings.domain"
                     placeholder="e.g., www.example.com"></a-input>
             </a-form-item>
+            <!-- Settings for xICMP -->
+            <a-form-item label='IP'
+                v-if="mask.type === 'xicmp'">
+                <a-input v-model.trim="mask.settings.ip"
+                    placeholder="e.g., 1.1.1.1"></a-input>
+            </a-form-item>
+            <a-form-item label='ID'
+                v-if="mask.type === 'xicmp'">
+                <a-input-number v-model.number="mask.settings.id"
+                    :min="0" :max="65535"></a-input-number>
+            </a-form-item>
         </a-form>
     </template>
 </a-form>

web/html/modals/inbound_info_modal.html

@@ -1,5 +1,8 @@
 {{define "modals/inboundInfoModal"}}
-<a-modal id="inbound-info-modal" v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}' :closable="true" :mask-closable="true" :footer="null" width="600px" :class="themeSwitcher.currentTheme">
+<a-modal id="inbound-info-modal" v-model="infoModal.visible"
+  title='{{ i18n "pages.inbounds.details"}}' :closable="true"
+  :mask-closable="true" :footer="null" width="600px"
+  :class="themeSwitcher.currentTheme">
   <a-row>
     <a-col :xs="24" :md="12">
       <table>
@@ -26,7 +29,8 @@
       </table>
     </a-col>
     <a-col :xs="24" :md="12">
-      <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+      <template
+        v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
         <table>
           <tr>
             <td>{{ i18n "transmission" }}</td>
@@ -34,7 +38,8 @@
               <a-tag color="green">[[ inbound.network ]]</a-tag>
             </td>
           </tr>
-          <template v-if="inbound.isTcp || inbound.isWs || inbound.isHttpupgrade || inbound.isXHTTP">
+          <template
+            v-if="inbound.isTcp || inbound.isWs || inbound.isHttpupgrade || inbound.isXHTTP">
             <tr>
               <td>{{ i18n "host" }}</td>
               <td v-if="inbound.host">
@@ -46,13 +51,13 @@
                 <a-tag color="orange">{{ i18n "none" }}</a-tag>
               </td>
             </tr>
-            </tr>
+          </tr>
-            <tr>
+          <tr>
-              <td>{{ i18n "path" }}</td>
+            <td>{{ i18n "path" }}</td>
-              <td v-if="inbound.path">
+            <td v-if="inbound.path">
-                <a-tooltip :title="[[ inbound.path ]]">
+              <a-tooltip :title="[[ inbound.path ]]">
-                  <a-tag class="info-large-tag">[[ inbound.path ]]</a-tag>
+                <a-tag class="info-large-tag">[[ inbound.path ]]</a-tag>
-                </a-tooltip>
+              </a-tooltip>
               <td v-else>
                 <a-tag color="orange">{{ i18n "none" }}</a-tag>
               </td>
@@ -66,420 +71,475 @@
               </td>
             </tr>
           </template>
-          <template v-if="inbound.isKcp">
-            <tr>
-              <td>kcp {{ i18n "encryption" }}</td>
-              <td>
-                <a-tag>[[ inbound.kcpType ]]</a-tag>
-              </td>
-            </tr>
-            <tr>
-              <td>kcp {{ i18n "password" }}</td>
-              <td>
-                <a-tag>[[ inbound.kcpSeed ]]</a-tag>
-              </td>
-            </tr>
-          </template>
           <template v-if="inbound.isGrpc">
             <tr>
               <td>grpc serviceName</td>
               <td>
                 <a-tooltip :title="[[ inbound.serviceName ]]">
-                  <a-tag class="info-large-tag">[[ inbound.serviceName ]]</a-tag>
+                  <a-tag class="info-large-tag">[[ inbound.serviceName
+                    ]]</a-tag>
                 </a-tooltip>
+                <tr>
+                  <td>grpc multiMode</td>
+                  <td>
+                    <a-tag>[[ inbound.stream.grpc.multiMode ]]</a-tag>
+                  </td>
+                </tr>
+              </template>
+            </table>
+          </template>
+        </a-col>
+        <template v-if="dbInbound.hasLink()">
+          {{ i18n "security" }}
+          <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[
+            inbound.stream.security ]]</a-tag>
+          <br />
+          <td>Authentication</td>
+          <a-tag v-if="inbound.settings.selectedAuth" color="green">[[
+            inbound.settings.selectedAuth ? inbound.settings.selectedAuth : ''
+            ]]</a-tag>
+          <a-tag v-else color="red">{{ i18n "none" }}</a-tag>
+          <br />
+          {{ i18n "encryption" }}
+          <a-tag class="info-large-tag"
+            :color="inbound.settings.encryption ? 'green' : 'red'">[[
+            inbound.settings.encryption ? inbound.settings.encryption : ''
+            ]]</a-tag>
+          <a-tooltip title='{{ i18n "copy" }}'>
+            <a-button size="small" icon="snippets"
+              @click="copy(inbound.settings.encryption)"></a-button>
+          </a-tooltip>
+          <br />
+          <template v-if="inbound.stream.security != 'none'">
+            {{ i18n "domainName" }}
+            <a-tag v-if="inbound.serverName" color="green">[[ inbound.serverName
+              ? inbound.serverName : '' ]]</a-tag>
+            <a-tag v-else color="orange">{{ i18n "none" }}</a-tag>
+          </template>
+        </template>
+        <table v-if="dbInbound.isSS"
+          :style="{ marginBottom: '10px', width: '100%' }">
+          <tr>
+            <td>{{ i18n "encryption" }}</td>
+            <td>
+              <a-tag color="green">[[ inbound.settings.method ]]</a-tag>
+            </td>
+          </tr>
+          <tr v-if="inbound.isSS2022">
+            <td>{{ i18n "password" }}</td>
+            <td>
+              <a-tooltip :title="[[ inbound.settings.password  ]]">
+                <a-tag class="info-large-tag">[[ inbound.settings.password
+                  ]]</a-tag>
+              </a-tooltip>
+            </td>
+          </tr>
+          <tr>
+            <td>{{ i18n "pages.inbounds.network" }}</td>
+            <td>
+              <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
+            </td>
+          </tr>
+        </table>
+        <template v-if="infoModal.clientSettings">
+          <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
+          <table :style="{ marginBottom: '10px' }">
             <tr>
-              <td>grpc multiMode</td>
+              <td>{{ i18n "pages.inbounds.email" }}</td>
-              <td>
+              <td v-if="infoModal.clientSettings.email">
-                <a-tag>[[ inbound.stream.grpc.multiMode ]]</a-tag>
+                <a-tag color="green">[[ infoModal.clientSettings.email
+                  ]]</a-tag>
+              </td>
+              <td v-else>
+                <a-tag color="red">{{ i18n "none" }}</a-tag>
               </td>
             </tr>
+            <tr v-if="infoModal.clientSettings.id">
+              <td>ID</td>
+              <td>
+                <a-tag>[[ infoModal.clientSettings.id ]]</a-tag>
+              </td>
+            </tr>
+            <tr v-if="dbInbound.isVMess">
+              <td>{{ i18n "security" }}</td>
+              <td>
+                <a-tag>[[ infoModal.clientSettings.security ]]</a-tag>
+              </td>
+            </tr>
+            <tr v-if="infoModal.inbound.canEnableTlsFlow()">
+              <td>Flow</td>
+              <td v-if="infoModal.clientSettings.flow">
+                <a-tag>[[ infoModal.clientSettings.flow ]]</a-tag>
+              </td>
+              <td v-else>
+                <a-tag color="orange">{{ i18n "none" }}</a-tag>
+              </td>
+            </tr>
+            <tr v-if="infoModal.clientSettings.password">
+              <td>{{ i18n "password" }}</td>
+              <td>
+                <a-tooltip :title="[[ infoModal.clientSettings.password  ]]">
+                  <a-tag class="info-large-tag">[[
+                    infoModal.clientSettings.password ]]</a-tag>
+                </a-tooltip>
+              </td>
+            </tr>
+            <tr>
+              <td>{{ i18n "status" }}</td>
+              <td>
+                <a-tag v-if="isDepleted" color="red">{{ i18n "depleted"
+                  }}</a-tag>
+                <a-tag v-else-if="isEnable" color="green">{{ i18n "enabled"
+                  }}</a-tag>
+                <a-tag v-else>{{ i18n "disabled" }}</a-tag>
+              </td>
+            </tr>
+            <tr v-if="infoModal.clientStats">
+              <td>{{ i18n "usage" }}</td>
+              <td>
+                <a-tag color="green">[[
+                  SizeFormatter.sizeFormat(infoModal.clientStats.up +
+                  infoModal.clientStats.down) ]]</a-tag>
+                <a-tag>↑ [[ SizeFormatter.sizeFormat(infoModal.clientStats.up)
+                  ]] / [[ SizeFormatter.sizeFormat(infoModal.clientStats.down)
+                  ]] ↓</a-tag>
+              </td>
+            </tr>
+            <tr>
+              <td>{{ i18n "pages.inbounds.createdAt" }}</td>
+              <td>
+                <template
+                  v-if="infoModal.clientSettings && infoModal.clientSettings.created_at">
+                  <a-tag>[[
+                    IntlUtil.formatDate(infoModal.clientSettings.created_at)
+                    ]]</a-tag>
+                </template>
+                <template v-else>
+                  <a-tag>-</a-tag>
+                </template>
+              </td>
+            </tr>
+            <tr>
+              <td>{{ i18n "pages.inbounds.updatedAt" }}</td>
+              <td>
+                <template
+                  v-if="infoModal.clientSettings && infoModal.clientSettings.updated_at">
+                  <a-tag>[[
+                    IntlUtil.formatDate(infoModal.clientSettings.updated_at)
+                    ]]</a-tag>
+                </template>
+                <template v-else>
+                  <a-tag>-</a-tag>
+                </template>
+              </td>
+            </tr>
+            <tr>
+              <td>{{ i18n "lastOnline" }}</td>
+              <td>
+                <a-tag>[[ app.formatLastOnline(infoModal.clientSettings &&
+                  infoModal.clientSettings.email ?
+                  infoModal.clientSettings.email : '') ]]</a-tag>
+              </td>
+            </tr>
+            <tr v-if="infoModal.clientSettings.comment">
+              <td>{{ i18n "comment" }}</td>
+              <td>
+                <a-tooltip :title="[[ infoModal.clientSettings.comment  ]]">
+                  <a-tag class="info-large-tag">[[
+                    infoModal.clientSettings.comment ]]</a-tag>
+                </a-tooltip>
+              </td>
+            </tr>
+            <tr v-if="app.ipLimitEnable">
+              <td>{{ i18n "pages.inbounds.IPLimit" }}</td>
+              <td>
+                <a-tag>[[ infoModal.clientSettings.limitIp ]]</a-tag>
+              </td>
+            </tr>
+            <tr
+              v-if="app.ipLimitEnable && infoModal.clientSettings.limitIp > 0">
+              <td>{{ i18n "pages.inbounds.IPLimitlog" }}</td>
+              <td>
+                <a-tag>[[ infoModal.clientIps ]]</a-tag>
+                <a-icon type="sync" :spin="refreshing" @click="refreshIPs"
+                  :style="{ margin: '0 5px' }"></a-icon>
+                <a-tooltip :title="[[ dbInbound.address ]]">
+                  <template slot="title">
+                    <span>{{ i18n "pages.inbounds.IPLimitlogclear" }}</span>
+                  </template>
+                  <a-icon type="delete" @click="clearClientIps"></a-icon>
+                </a-tooltip>
+              </td>
+            </tr>
+          </table>
+          <table
+            :style="{ display: 'inline-table', marginBlock: '10px', width: '100%', textAlign: 'center' }">
+            <tr>
+              <th>{{ i18n "remained" }}</th>
+              <th>{{ i18n "pages.inbounds.totalFlow" }}</th>
+              <th>{{ i18n "pages.inbounds.expireDate" }}</th>
+            </tr>
+            <tr>
+              <td>
+                <a-tag
+                  v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0"
+                  :color="statsColor(infoModal.clientStats)"> [[ getRemStats()
+                  ]] </a-tag>
+              </td>
+              <td>
+                <a-tag v-if="infoModal.clientSettings.totalGB > 0"
+                  :color="statsColor(infoModal.clientStats)"> [[
+                  SizeFormatter.sizeFormat(infoModal.clientSettings.totalGB) ]]
+                </a-tag>
+                <a-tag v-else color="purple" class="infinite-tag">
+                  <svg height="10px" width="14px" viewBox="0 0 640 512"
+                    fill="currentColor">
+                    <path
+                      d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z"
+                      fill="currentColor"></path>
+                  </svg>
+                </a-tag>
+              </td>
+              <td>
+                <template v-if="infoModal.clientSettings.expiryTime > 0">
+                  <a-tag
+                    :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)">
+                    [[ IntlUtil.formatDate(infoModal.clientSettings.expiryTime)
+                    ]]
+                  </a-tag>
+                </template>
+                <a-tag v-else-if="infoModal.clientSettings.expiryTime < 0"
+                  color="green">[[ infoModal.clientSettings.expiryTime /
+                  -86400000 ]] {{ i18n "pages.client.days" }}
+                </a-tag>
+                <a-tag v-else color="purple" class="infinite-tag">
+                  <svg height="10px" width="14px" viewBox="0 0 640 512"
+                    fill="currentColor">
+                    <path
+                      d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z"
+                      fill="currentColor"></path>
+                  </svg>
+                </a-tag>
+              </td>
+            </tr>
+          </table>
+          <template
+            v-if="app.subSettings.enable && infoModal.clientSettings.subId">
+            <a-divider>Subscription URL</a-divider>
+            <tr-info-row class="tr-info-row">
+              <tr-info-title class="tr-info-title">
+                <a-tag color="purple">Subscription Link</a-tag>
+                <a-tooltip title='{{ i18n "copy" }}'>
+                  <a-button size="small" icon="snippets"
+                    @click="copy(infoModal.subLink)"></a-button>
+                </a-tooltip>
+              </tr-info-title>
+              <a :href="[[ infoModal.subLink ]]" target="_blank">[[
+                infoModal.subLink ]]</a>
+            </tr-info-row>
+            <tr-info-row class="tr-info-row"
+              v-if="app.subSettings.subJsonEnable">
+              <tr-info-title class="tr-info-title">
+                <a-tag color="purple">Json Link</a-tag>
+                <a-tooltip title='{{ i18n "copy" }}'>
+                  <a-button size="small" icon="snippets"
+                    @click="copy(infoModal.subJsonLink)"></a-button>
+                </a-tooltip>
+              </tr-info-title>
+              <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[
+                infoModal.subJsonLink ]]</a>
+            </tr-info-row>
+          </template>
+          <template v-if="app.tgBotEnable && infoModal.clientSettings.tgId">
+            <a-divider>Telegram ChatID</a-divider>
+            <tr-info-row class="tr-info-row">
+              <tr-info-title class="tr-info-title">
+                <a-tag color="blue">[[ infoModal.clientSettings.tgId ]]</a-tag>
+                <a-tooltip title='{{ i18n "copy" }}'>
+                  <a-button size="small" icon="snippets"
+                    @click="copy(infoModal.clientSettings.tgId)"></a-button>
+                </a-tooltip>
+              </tr-info-title>
+            </tr-info-row>
+          </template>
+          <template v-if="dbInbound.hasLink()">
+            <a-divider>URL</a-divider>
+            <tr-info-row v-for="(link,index) in infoModal.links"
+              class="tr-info-row">
+              <tr-info-title class="tr-info-title">
+                <a-tag class="tr-info-tag" color="green">[[ link.remark
+                  ]]</a-tag>
+                <a-tooltip title='{{ i18n "copy" }}'>
+                  <a-button :style="{ minWidth: '24px' }" size="small"
+                    icon="snippets" @click="copy(link.link)"></a-button>
+                </a-tooltip>
+              </tr-info-title>
+              <code>[[ link.link ]]</code>
+            </tr-info-row>
           </template>
-        </table>
-      </template>
-    </a-col>
-    <template v-if="dbInbound.hasLink()">
-      {{ i18n "security" }}
-      <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
-      <br />
-      <td>Authentication</td>
-        <a-tag v-if="inbound.settings.selectedAuth" color="green">[[ inbound.settings.selectedAuth ? inbound.settings.selectedAuth : '' ]]</a-tag>
-        <a-tag v-else color="red">{{ i18n "none" }}</a-tag>
-      <br />
-      {{ i18n "encryption" }}
-        <a-tag class="info-large-tag" :color="inbound.settings.encryption ? 'green' : 'red'">[[ inbound.settings.encryption ? inbound.settings.encryption : '' ]]</a-tag>
-        <a-tooltip title='{{ i18n "copy" }}'>
-          <a-button size="small" icon="snippets" @click="copy(inbound.settings.encryption)"></a-button>
-        </a-tooltip>
-      <br />
-      <template v-if="inbound.stream.security != 'none'">
-        {{ i18n "domainName" }}
-        <a-tag v-if="inbound.serverName" color="green">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
-        <a-tag v-else color="orange">{{ i18n "none" }}</a-tag>
-      </template>
-    </template>
-    <table v-if="dbInbound.isSS" :style="{ marginBottom: '10px', width: '100%' }">
-      <tr>
-        <td>{{ i18n "encryption" }}</td>
-        <td>
-          <a-tag color="green">[[ inbound.settings.method ]]</a-tag>
-        </td>
-      </tr>
-      <tr v-if="inbound.isSS2022">
-        <td>{{ i18n "password" }}</td>
-        <td>
-          <a-tooltip :title="[[ inbound.settings.password  ]]">
-            <a-tag class="info-large-tag">[[ inbound.settings.password ]]</a-tag>
-          </a-tooltip>
-        </td>
-      </tr>
-      <tr>
-        <td>{{ i18n "pages.inbounds.network" }}</td>
-        <td>
-          <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
-        </td>
-      </tr>
-    </table>
-    <template v-if="infoModal.clientSettings">
-      <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
-      <table :style="{ marginBottom: '10px' }">
-        <tr>
-          <td>{{ i18n "pages.inbounds.email" }}</td>
-          <td v-if="infoModal.clientSettings.email">
-            <a-tag color="green">[[ infoModal.clientSettings.email ]]</a-tag>
-          </td>
-          <td v-else>
-            <a-tag color="red">{{ i18n "none" }}</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.id">
-          <td>ID</td>
-          <td>
-            <a-tag>[[ infoModal.clientSettings.id ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="dbInbound.isVMess">
-          <td>{{ i18n "security" }}</td>
-          <td>
-            <a-tag>[[ infoModal.clientSettings.security ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.inbound.canEnableTlsFlow()">
-          <td>Flow</td>
-          <td v-if="infoModal.clientSettings.flow">
-            <a-tag>[[ infoModal.clientSettings.flow ]]</a-tag>
-          </td>
-          <td v-else>
-            <a-tag color="orange">{{ i18n "none" }}</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.password">
-          <td>{{ i18n "password" }}</td>
-          <td>
-            <a-tooltip :title="[[ infoModal.clientSettings.password  ]]">
-              <a-tag class="info-large-tag">[[ infoModal.clientSettings.password ]]</a-tag>
-            </a-tooltip>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "status" }}</td>
-          <td>
-            <a-tag v-if="isDepleted" color="red">{{ i18n "depleted" }}</a-tag>
-            <a-tag v-else-if="isEnable" color="green">{{ i18n "enabled" }}</a-tag>
-            <a-tag v-else>{{ i18n "disabled" }}</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientStats">
-          <td>{{ i18n "usage" }}</td>
-          <td>
-            <a-tag color="green">[[ SizeFormatter.sizeFormat(infoModal.clientStats.up + infoModal.clientStats.down) ]]</a-tag>
-            <a-tag>↑ [[ SizeFormatter.sizeFormat(infoModal.clientStats.up) ]] / [[ SizeFormatter.sizeFormat(infoModal.clientStats.down) ]] ↓</a-tag>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "pages.inbounds.createdAt" }}</td>
-          <td>
-            <template v-if="infoModal.clientSettings && infoModal.clientSettings.created_at">
-              <a-tag>[[ IntlUtil.formatDate(infoModal.clientSettings.created_at) ]]</a-tag>
-            </template>
-            <template v-else>
-              <a-tag>-</a-tag>
-            </template>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "pages.inbounds.updatedAt" }}</td>
-          <td>
-            <template v-if="infoModal.clientSettings && infoModal.clientSettings.updated_at">
-              <a-tag>[[ IntlUtil.formatDate(infoModal.clientSettings.updated_at) ]]</a-tag>
-            </template>
-            <template v-else>
-              <a-tag>-</a-tag>
-            </template>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "lastOnline" }}</td>
-          <td>
-            <a-tag>[[ app.formatLastOnline(infoModal.clientSettings && infoModal.clientSettings.email ? infoModal.clientSettings.email : '') ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.comment">
-          <td>{{ i18n "comment" }}</td>
-          <td>
-            <a-tooltip :title="[[ infoModal.clientSettings.comment  ]]">
-              <a-tag class="info-large-tag">[[ infoModal.clientSettings.comment ]]</a-tag>
-            </a-tooltip>
-          </td>
-        </tr>
-        <tr v-if="app.ipLimitEnable">
-          <td>{{ i18n "pages.inbounds.IPLimit" }}</td>
-          <td>
-            <a-tag>[[ infoModal.clientSettings.limitIp ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="app.ipLimitEnable && infoModal.clientSettings.limitIp > 0">
-          <td>{{ i18n "pages.inbounds.IPLimitlog" }}</td>
-          <td>
-            <a-tag>[[ infoModal.clientIps ]]</a-tag>
-            <a-icon type="sync" :spin="refreshing" @click="refreshIPs" :style="{ margin: '0 5px' }"></a-icon>
-            <a-tooltip :title="[[ dbInbound.address ]]">
-              <template slot="title">
-                <span>{{ i18n "pages.inbounds.IPLimitlogclear" }}</span>
-              </template>
-              <a-icon type="delete" @click="clearClientIps"></a-icon>
-            </a-tooltip>
-          </td>
-        </tr>
-      </table>
-      <table :style="{ display: 'inline-table', marginBlock: '10px', width: '100%', textAlign: 'center' }">
-        <tr>
-          <th>{{ i18n "remained" }}</th>
-          <th>{{ i18n "pages.inbounds.totalFlow" }}</th>
-          <th>{{ i18n "pages.inbounds.expireDate" }}</th>
-        </tr>
-        <tr>
-          <td>
-            <a-tag v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ getRemStats() ]] </a-tag>
-          </td>
-          <td>
-            <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ SizeFormatter.sizeFormat(infoModal.clientSettings.totalGB) ]] </a-tag>
-            <a-tag v-else color="purple" class="infinite-tag">
-              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-              </svg>
-            </a-tag>
-          </td>
-          <td>
-            <template v-if="infoModal.clientSettings.expiryTime > 0">
-              <a-tag :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)"> 
-                [[ IntlUtil.formatDate(infoModal.clientSettings.expiryTime) ]]
-              </a-tag>
-            </template>
-            <a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="green">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}
-            </a-tag>
-            <a-tag v-else color="purple" class="infinite-tag">
-              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-              </svg>
-            </a-tag>
-          </td>
-        </tr>
-      </table>
-      <template v-if="app.subSettings.enable && infoModal.clientSettings.subId">
-        <a-divider>Subscription URL</a-divider>
-        <tr-info-row class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag color="purple">Subscription Link</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copy(infoModal.subLink)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a>
-        </tr-info-row>
-        <tr-info-row class="tr-info-row" v-if="app.subSettings.subJsonEnable">
-          <tr-info-title class="tr-info-title">
-            <a-tag color="purple">Json Link</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copy(infoModal.subJsonLink)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a>
-        </tr-info-row>
-      </template>
-      <template v-if="app.tgBotEnable && infoModal.clientSettings.tgId">
-        <a-divider>Telegram ChatID</a-divider>
-        <tr-info-row class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag color="blue">[[ infoModal.clientSettings.tgId ]]</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copy(infoModal.clientSettings.tgId)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-        </tr-info-row>
-      </template>
-      <template v-if="dbInbound.hasLink()">
-        <a-divider>URL</a-divider>
-        <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button :style="{ minWidth: '24px' }" size="small" icon="snippets" @click="copy(link.link)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <code>[[ link.link ]]</code>
-        </tr-info-row>
-      </template>
-    </template>
-    <template v-else>
-      <template v-if="dbInbound.isSS && !inbound.isSSMultiUser">
-        <a-divider>URL</a-divider>
-        <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button :style="{ minWidth: '24px' }" size="small" icon="snippets" @click="copy(link.link)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <code>[[ link.link ]]</code>
-        </tr-info-row>
-      </template>
-      <table v-if="inbound.protocol == Protocols.TUNNEL" class="tr-info-table">
-        <tr>
-          <th>{{ i18n "pages.inbounds.targetAddress" }}</th>
-          <th>{{ i18n "pages.inbounds.destinationPort" }}</th>
-          <th>{{ i18n "pages.inbounds.network" }}</th>
-          <th>FollowRedirect</th>
-        </tr>
-        <tr>
-          <td>
-            <a-tag color="green">[[ inbound.settings.address ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.port ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.followRedirect ]]</a-tag>
-          </td>
-        </tr>
-      </table>
-      <table v-if="dbInbound.isMixed" class="tr-info-table">
-        <tr>
-          <th>{{ i18n "password" }} Auth</th>
-          <th>{{ i18n "pages.inbounds.enable" }} udp</th>
-          <th>IP</th>
-        </tr>
-        <tr>
-          <td>
-            <a-tag color="green">[[ inbound.settings.auth ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.udp]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.ip ]]</a-tag>
-          </td>
-        </tr>
-        <template v-if="inbound.settings.auth == 'password'">
-          <tr>
-            <td></td>
-            <td>{{ i18n "username" }}</td>
-            <td>{{ i18n "password" }}</td>
-          </tr>
-          <tr v-for="account,index in inbound.settings.accounts">
-            <td>[[ index ]]</td>
-            <td>
-              <a-tag color="green">[[ account.user ]]</a-tag>
-            </td>
-            <td>
-              <a-tag color="green">[[ account.pass ]]</a-tag>
-            </td>
-          </tr>
         </template>
-      </table>
+        <template v-else>
-      <table v-if="dbInbound.isHTTP" class="tr-info-table">
+          <template v-if="dbInbound.isSS && !inbound.isSSMultiUser">
-        <tr>
+            <a-divider>URL</a-divider>
-          <th></th>
+            <tr-info-row v-for="(link,index) in infoModal.links"
-          <th>{{ i18n "username" }}</th>
+              class="tr-info-row">
-          <th>{{ i18n "password" }}</th>
+              <tr-info-title class="tr-info-title">
-        </tr>
+                <a-tag class="tr-info-tag" color="green">[[ link.remark
-        <tr v-for="account,index in inbound.settings.accounts">
+                  ]]</a-tag>
-          <td>[[ index ]]</td>
+                <a-tooltip title='{{ i18n "copy" }}'>
-          <td>
+                  <a-button :style="{ minWidth: '24px' }" size="small"
-            <a-tag color="green">[[ account.user ]]</a-tag>
+                    icon="snippets" @click="copy(link.link)"></a-button>
-          </td>
+                </a-tooltip>
-          <td>
+              </tr-info-title>
-            <a-tag color="green">[[ account.pass ]]</a-tag>
+              <code>[[ link.link ]]</code>
-          </td>
+            </tr-info-row>
-        </tr>
+          </template>
-      </table>
+          <table v-if="inbound.protocol == Protocols.TUNNEL"
-      <table v-if="dbInbound.isWireguard" class="tr-info-table">
+            class="tr-info-table">
-        <tr class="client-table-odd-row">
+            <tr>
-          <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
+              <th>{{ i18n "pages.inbounds.targetAddress" }}</th>
-          <td>[[ inbound.settings.secretKey ]]</td>
+              <th>{{ i18n "pages.inbounds.destinationPort" }}</th>
-        </tr>
+              <th>{{ i18n "pages.inbounds.network" }}</th>
-        <tr>
+              <th>FollowRedirect</th>
-          <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
+            </tr>
-          <td>[[ inbound.settings.pubKey ]]</td>
+            <tr>
-        </tr>
+              <td>
-        <tr class="client-table-odd-row">
+                <a-tag color="green">[[ inbound.settings.address ]]</a-tag>
-          <td>MTU</td>
+              </td>
-          <td>[[ inbound.settings.mtu ]]</td>
+              <td>
-        </tr>
+                <a-tag color="green">[[ inbound.settings.port ]]</a-tag>
-        <tr>
+              </td>
-          <td>No Kernel Tun</td>
+              <td>
-          <td>[[ inbound.settings.noKernelTun ]]</td>
+                <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
-        </tr>
+              </td>
-        <template v-for="(peer, index) in inbound.settings.peers">
+              <td>
-          <tr>
+                <a-tag color="green">[[ inbound.settings.followRedirect
-            <td colspan="2">
+                  ]]</a-tag>
-              <a-divider>Peer [[ index + 1 ]]</a-divider>
+              </td>
-            </td>
+            </tr>
-          </tr>
+          </table>
-          <tr class="client-table-odd-row">
+          <table v-if="dbInbound.isMixed" class="tr-info-table">
-            <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
+            <tr>
-            <td>[[ peer.privateKey ]]</td>
+              <th>{{ i18n "password" }} Auth</th>
-          </tr>
+              <th>{{ i18n "pages.inbounds.enable" }} udp</th>
-          <tr>
+              <th>IP</th>
-            <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
+            </tr>
-            <td>[[ peer.publicKey ]]</td>
+            <tr>
-          </tr>
+              <td>
-          <tr class="client-table-odd-row">
+                <a-tag color="green">[[ inbound.settings.auth ]]</a-tag>
-            <td>{{ i18n "pages.xray.wireguard.psk" }}</td>
+              </td>
-            <td>[[ peer.psk ]]</td>
+              <td>
-          </tr>
+                <a-tag color="green">[[ inbound.settings.udp]]</a-tag>
-          <tr>
+              </td>
-            <td>{{ i18n "pages.xray.wireguard.allowedIPs" }}</td>
+              <td>
-            <td>[[ peer.allowedIPs.join(",") ]]</td>
+                <a-tag color="green">[[ inbound.settings.ip ]]</a-tag>
-          </tr>
+              </td>
-          <tr class="client-table-odd-row">
+            </tr>
-            <td>Keep Alive</td>
+            <template v-if="inbound.settings.auth == 'password'">
-            <td>[[ peer.keepAlive ]]</td>
+              <tr>
-          </tr>
+                <td></td>
-          <tr>
+                <td>{{ i18n "username" }}</td>
-            <td colspan="2">
+                <td>{{ i18n "password" }}</td>
-              <tr-info-row class="tr-info-row">
+              </tr>
-                <tr-info-title class="tr-info-title">
+              <tr v-for="account,index in inbound.settings.accounts">
-                  <a-tag color="blue">Config</a-tag>
+                <td>[[ index ]]</td>
-                  <a-tooltip title='{{ i18n "copy" }}'>
+                <td>
-                    <a-button :style="{ minWidth: '24px' }" size="small" icon="snippets" @click="copy(infoModal.links[index])"></a-button>
+                  <a-tag color="green">[[ account.user ]]</a-tag>
-                  </a-tooltip>
+                </td>
-                  <a-tooltip title='{{ i18n "download" }}'>
+                <td>
-                    <a-button :style="{ minWidth: '24px' }" size="small" icon="download" @click="FileManager.downloadTextFile(infoModal.links[index], `peer-${index + 1}.conf`)"></a-button>
+                  <a-tag color="green">[[ account.pass ]]</a-tag>
-                  </a-tooltip>
+                </td>
-                </tr-info-title>
+              </tr>
-                <div v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)" :style="{ borderRadius: '1rem', padding: '0.5rem' }" class="client-table-odd-row">
+            </template>
-                </div>
+          </table>
-              </tr-info-row>
+          <table v-if="dbInbound.isHTTP" class="tr-info-table">
-            </td>
+            <tr>
-          </tr>
+              <th></th>
-      </table>
+              <th>{{ i18n "username" }}</th>
-    </template>
+              <th>{{ i18n "password" }}</th>
-    </template>
+            </tr>
-</a-modal>
+            <tr v-for="account,index in inbound.settings.accounts">
-<script>
+              <td>[[ index ]]</td>
+              <td>
+                <a-tag color="green">[[ account.user ]]</a-tag>
+              </td>
+              <td>
+                <a-tag color="green">[[ account.pass ]]</a-tag>
+              </td>
+            </tr>
+          </table>
+          <table v-if="dbInbound.isWireguard" class="tr-info-table">
+            <tr class="client-table-odd-row">
+              <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
+              <td>[[ inbound.settings.secretKey ]]</td>
+            </tr>
+            <tr>
+              <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
+              <td>[[ inbound.settings.pubKey ]]</td>
+            </tr>
+            <tr class="client-table-odd-row">
+              <td>MTU</td>
+              <td>[[ inbound.settings.mtu ]]</td>
+            </tr>
+            <tr>
+              <td>No Kernel Tun</td>
+              <td>[[ inbound.settings.noKernelTun ]]</td>
+            </tr>
+            <template v-for="(peer, index) in inbound.settings.peers">
+              <tr>
+                <td colspan="2">
+                  <a-divider>Peer [[ index + 1 ]]</a-divider>
+                </td>
+              </tr>
+              <tr class="client-table-odd-row">
+                <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
+                <td>[[ peer.privateKey ]]</td>
+              </tr>
+              <tr>
+                <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
+                <td>[[ peer.publicKey ]]</td>
+              </tr>
+              <tr class="client-table-odd-row">
+                <td>{{ i18n "pages.xray.wireguard.psk" }}</td>
+                <td>[[ peer.psk ]]</td>
+              </tr>
+              <tr>
+                <td>{{ i18n "pages.xray.wireguard.allowedIPs" }}</td>
+                <td>[[ peer.allowedIPs.join(",") ]]</td>
+              </tr>
+              <tr class="client-table-odd-row">
+                <td>Keep Alive</td>
+                <td>[[ peer.keepAlive ]]</td>
+              </tr>
+              <tr>
+                <td colspan="2">
+                  <tr-info-row class="tr-info-row">
+                    <tr-info-title class="tr-info-title">
+                      <a-tag color="blue">Config</a-tag>
+                      <a-tooltip title='{{ i18n "copy" }}'>
+                        <a-button :style="{ minWidth: '24px' }" size="small"
+                          icon="snippets"
+                          @click="copy(infoModal.links[index])"></a-button>
+                      </a-tooltip>
+                      <a-tooltip title='{{ i18n "download" }}'>
+                        <a-button :style="{ minWidth: '24px' }" size="small"
+                          icon="download"
+                          @click="FileManager.downloadTextFile(infoModal.links[index], `peer-${index + 1}.conf`)"></a-button>
+                      </a-tooltip>
+                    </tr-info-title>
+                    <div
+                      v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)"
+                      :style="{ borderRadius: '1rem', padding: '0.5rem' }"
+                      class="client-table-odd-row">
+                    </div>
+                  </tr-info-row>
+                </td>
+              </tr>
+            </table>
+          </template>
+        </template>
+      </a-modal>
+      <script>
   function refreshIPs(email) {
     return HttpUtil.post(`/panel/api/inbounds/clientIps/${email}`).then((msg) => {
       if (msg.success) {
@@ -632,4 +692,4 @@
     },
   });
 </script>
-{{end}}
+      {{end}}

web/html/modals/xray_rule_modal.html

@@ -219,14 +219,14 @@
       rule = {};
       newRule = {};
       rule.type = "field";
-      rule.domain = value.domain.length > 0 ? value.domain.split(',') : [];
+      rule.domain = value.domain.length > 0 ? value.domain.split(',').map(s => s.trim()) : [];
-      rule.ip = value.ip.length > 0 ? value.ip.split(',') : [];
+      rule.ip = value.ip.length > 0 ? value.ip.split(',').map(s => s.trim()) : [];
       rule.port = value.port;
       rule.sourcePort = value.sourcePort;
       rule.vlessRoute = value.vlessRoute;
       rule.network = value.network;
-      rule.sourceIP = value.sourceIP.length > 0 ? value.sourceIP.split(',') : [];
+      rule.sourceIP = value.sourceIP.length > 0 ? value.sourceIP.split(',').map(s => s.trim()) : [];
-      rule.user = value.user.length > 0 ? value.user.split(',') : [];
+      rule.user = value.user.length > 0 ? value.user.split(',').map(s => s.trim()) : [];
       rule.inboundTag = value.inboundTag;
       rule.protocol = value.protocol;
       rule.attrs = Object.fromEntries(value.attrs);

web/service/server.go

@@ -1087,13 +1087,60 @@ func (s *ServerService) UpdateGeofile(fileName string) error {
 			return common.NewErrorf("Invalid geofile name: %s not in allowlist", fileName)
 		}
 	}
+
 	downloadFile := func(url, destPath string) error {
-		resp, err := http.Get(url)
+		var req *http.Request
+		req, err := http.NewRequest("GET", url, nil)
+		if err != nil {
+			return common.NewErrorf("Failed to create HTTP request for %s: %v", url, err)
+		}
+
+		var localFileModTime time.Time
+		if fileInfo, err := os.Stat(destPath); err == nil {
+			localFileModTime = fileInfo.ModTime()
+			if !localFileModTime.IsZero() {
+				req.Header.Set("If-Modified-Since", localFileModTime.UTC().Format(http.TimeFormat))
+			}
+		}
+
+		client := &http.Client{}
+		resp, err := client.Do(req)
 		if err != nil {
 			return common.NewErrorf("Failed to download Geofile from %s: %v", url, err)
 		}
 		defer resp.Body.Close()
 
+		// Parse Last-Modified header from server
+		var serverModTime time.Time
+		serverModTimeStr := resp.Header.Get("Last-Modified")
+		if serverModTimeStr != "" {
+			parsedTime, err := time.Parse(http.TimeFormat, serverModTimeStr)
+			if err != nil {
+				logger.Warningf("Failed to parse Last-Modified header for %s: %v", url, err)
+			} else {
+				serverModTime = parsedTime
+			}
+		}
+
+		// Function to update local file's modification time
+		updateFileModTime := func() {
+			if !serverModTime.IsZero() {
+				if err := os.Chtimes(destPath, serverModTime, serverModTime); err != nil {
+					logger.Warningf("Failed to update modification time for %s: %v", destPath, err)
+				}
+			}
+		}
+
+		// Handle 304 Not Modified
+		if resp.StatusCode == http.StatusNotModified {
+			updateFileModTime()
+			return nil
+		}
+
+		if resp.StatusCode != http.StatusOK {
+			return common.NewErrorf("Failed to download Geofile from %s: received status code %d", url, resp.StatusCode)
+		}
+
 		file, err := os.Create(destPath)
 		if err != nil {
 			return common.NewErrorf("Failed to create Geofile %s: %v", destPath, err)
@@ -1105,6 +1152,7 @@ func (s *ServerService) UpdateGeofile(fileName string) error {
 			return common.NewErrorf("Failed to save Geofile %s: %v", destPath, err)
 		}
 
+		updateFileModTime()
 		return nil
 	}
 
@@ -1114,7 +1162,6 @@ func (s *ServerService) UpdateGeofile(fileName string) error {
 		for _, file := range files {
 			// Sanitize the filename from our allowlist as an extra precaution
 			destPath := filepath.Join(config.GetBinFolderPath(), filepath.Base(file.FileName))
-
 			if err := downloadFile(file.URL, destPath); err != nil {
 				errorMessages = append(errorMessages, fmt.Sprintf("Error downloading Geofile '%s': %v", file.FileName, err))
 			}