v2.8.2

go package correction
cpu history timeframe (#3509 )
2026-11-02 00:16:29 +00:00 · 2025-09-19 00:22:15 +02:00 · 2025-09-18 23:12:14 +02:00 · 2025-09-18 20:52:31 +02:00 · 2025-09-18 20:14:10 +02:00 · 2025-09-18 16:28:09 +02:00
81 changed files with 480 additions and 294 deletions
@@ -11,4 +11,4 @@ issuehunt: # Replace with a single IssueHunt username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 polar: # Replace with a single Polar username
 buy_me_a_coffee: mhsanaei
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: https://nowpayments.io/donation/hsanaei
@@ -0,0 +1,35 @@
+{
+  "$schema": "vscode://schemas/launch",
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run 3x-ui (Debug)",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}",
+      "cwd": "${workspaceFolder}",
+      "env": {
+        "XUI_DEBUG": "true"
+      },
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "Run 3x-ui (Debug, custom env)",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}",
+      "cwd": "${workspaceFolder}",
+      "env": {
+        // Set to true to serve assets/templates directly from disk for development
+        "XUI_DEBUG": "true",
+        // Uncomment to override DB folder location (by default uses working dir on Windows when debug)
+        // "XUI_DB_FOLDER": "${workspaceFolder}",
+        // Example: override log level (debug|info|notice|warn|error)
+        // "XUI_LOG_LEVEL": "debug"
+      },
+      "console": "integratedTerminal"
+    }
+  ]
+}
@@ -0,0 +1,40 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "go: build",
+      "type": "shell",
+      "command": "go",
+      "args": ["build", "-o", "bin/3x-ui.exe", "./main.go"],
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "problemMatcher": ["$go"],
+      "group": { "kind": "build", "isDefault": true }
+    },
+    {
+      "label": "go: run",
+      "type": "shell",
+      "command": "go",
+      "args": ["run", "./main.go"],
+      "options": {
+        "cwd": "${workspaceFolder}",
+        "env": {
+          "XUI_DEBUG": "true"
+        }
+      },
+      "problemMatcher": ["$go"]
+    },
+    {
+      "label": "go: test",
+      "type": "shell",
+      "command": "go",
+      "args": ["test", "./..."],
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "problemMatcher": ["$go"],
+      "group": "test"
+    }
+  ]
+}
@@ -41,15 +41,13 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 **إذا كان هذا المشروع مفيدًا لك، فقد ترغب في إعطائه**:star2:

-<p align="left">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
-    <img src="./media/buymeacoffe.png" alt="Image">
-  </a>
-</p>
-
- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
+</a>
+</br>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>

 ## النجوم عبر الزمن

@@ -41,15 +41,14 @@ Para documentación completa, visita la [Wiki del proyecto](https://github.com/M

 **Si este proyecto te es útil, puedes darle una**:star2:

-<p align="left">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
-    <img src="./media/buymeacoffe.png" alt="Image">
-  </a>
-</p>
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
+</a>

- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+</br>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>

 ## Estrellas a lo Largo del Tiempo

@@ -41,15 +41,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 **اگر این پروژه برای شما مفید است، می‌توانید به آن یک**:star2: بدهید

-<p align="left">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
-    <img src="./media/buymeacoffe.png" alt="Image">
-  </a>
-</p>
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
+</a>

- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+</br>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>

 ## ستاره‌ها در طول زمان

@@ -41,15 +41,14 @@ For full documentation, please visit the [project Wiki](https://github.com/MHSan

 **If this project is helpful to you, you may wish to give it a**:star2:

-<p align="left">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
-    <img src="./media/buymeacoffe.png" alt="Image">
-  </a>
-</p>
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
+</a>

- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+</br>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>

 ## Stargazers over Time

@@ -41,15 +41,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 **Если этот проект полезен для вас, вы можете поставить ему**:star2:

-<p align="left">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
-    <img src="./media/buymeacoffe.png" alt="Image">
-  </a>
-</p>
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
+</a>

- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+</br>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>

 ## Звезды с течением времени

@@ -41,15 +41,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 **如果这个项目对您有帮助，您可以给它一个**:star2:

-<p align="left">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
-    <img src="./media/buymeacoffe.png" alt="Image">
-  </a>
-</p>
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
+</a>

- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+</br>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>

 ## 随时间变化的星标数

@@ -1 +1 @@
-2.8.1
+2.8.2
@@ -9,10 +9,10 @@ import (
 	"path"
 	"slices"

-	"x-ui/config"
-	"x-ui/database/model"
-	"x-ui/util/crypto"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/xray"

 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
@@ -141,6 +141,9 @@ func InitDB(dbPath string) error {
 	}

 	isUsersEmpty, err := isTableEmpty("users")
+	if err != nil {
+		return err
+	}

 	if err := initUser(); err != nil {
 		return err
@@ -3,8 +3,8 @@ package model
 import (
 	"fmt"

-	"x-ui/util/json_util"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 type Protocol string
@@ -1,4 +1,4 @@
-module x-ui
+module github.com/mhsanaei/3x-ui

 go 1.25.1

@@ -9,14 +9,14 @@ import (
 	"syscall"
 	_ "unsafe"

-	"x-ui/config"
-	"x-ui/database"
-	"x-ui/logger"
-	"x-ui/sub"
-	"x-ui/util/crypto"
-	"x-ui/web"
-	"x-ui/web/global"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/sub"
+	"github.com/mhsanaei/3x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/web"
+	"github.com/mhsanaei/3x-ui/web/global"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/joho/godotenv"
 	"github.com/op/go-logging"
@@ -0,0 +1 @@
+<svg width="347" height="107" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 347.25 107"><defs><style>.cls-3,.cls-5{fill:none;stroke:#27282d;stroke-width:2.5px}.cls-3{stroke-linecap:round;stroke-miterlimit:10}</style></defs><path d="M184.25 29l9.44-18.57s9.9 18.29 9.46 18.57-9.42 6.63-9.42 6.63zm.08 6.64l9.41 6.59 9.42-6.59-9.42 15.72z" stroke-linecap="square" stroke-linejoin="round" fill="none" stroke="#27282d" stroke-width="2.5"/><path d="M17.17 0h313.25a16.75 16.75 0 0116.83 16.68v73.64A16.77 16.77 0 01330.33 107H17.17A16.9 16.9 0 01.25 90.24V16.68A16.77 16.77 0 0117.17 0z" fill="#13171c"/><path class="cls-3" d="M137.73 72.27h17.45c2 0 3.4 2.33 2.72 4.55l-3.49 11.58a3 3 0 01-2.73 2.26h-19.52m7.7-9.18h-10.87"/><path d="M96.44 38.72l-1.21-.3-.37 1.58h1.58zM112.25 40a1.25 1.25 0 000-2.5zm-10.17-30l-6.83 28.42 2.43.59 6.85-28.45zm-5.64 30h15.81v-2.5H96.44z" fill="#27282d"/><path class="cls-3" d="M106.25 24.24L92.63 29"/><path class="cls-5" d="M14.2 18.3h6.94v6.73H14.2zm-.55 68.24h6.94v6.73h-6.94zM192.68 2.27v52.58h-62.85V107M0 65.93h78.25v40.8m177.07 0V51.84h20.48m49.74 54.89V51.84h-21.56m-48.66 16.53h70.44M271.58 60h37.06m-4.77-40.58v15.51m-13.44-16.61v11.77m-11.49-13v10.1m2.44 32.06a8.29 8.29 0 01-.49-2.78 8.67 8.67 0 0117.34 0 8.29 8.29 0 01-.48 2.78"/><path class="cls-5" d="M275.8 59.63a14 14 0 01-.5-3.68 14.7 14.7 0 0129.39 0 14 14 0 01-.49 3.68M316.87 2v25.66H347"/><path d="M29.82 21.54l8.1-9.39 8.12 9.39m4.36 5.04L51.66 28m-14.3-1.42l1.3 1.42m-14.03-1.42l1.3 1.42m20.11 5.93l-8.12 9.4-8.1-9.4" stroke-miterlimit="10" fill="none" stroke="#27282d" stroke-width="2.5"/><path d="M39.25 58.39h4.42L53.32 73V58.39h4.72v22.44h-4.32l-9.65-14.55v14.55h-4.72V58.39zm34 23.02a14.73 14.73 0 01-4.72-.77 8.59 8.59 0 01-3.41-2.41 9.9 9.9 0 01-2.22-3.66 15.5 15.5 0 010-9.83 9.22 9.22 0 012.22-3.66 8.49 8.49 0 013.51-2.31 11.9 11.9 0 014.62-.77 14.75 14.75 0 014.73.77 11.21 11.21 0 013.52 2.31 11.58 11.58 0 012.21 3.66 15.08 15.08 0 01.7 4.92 15 15 0 01-.7 4.91 10.39 10.39 0 01-2.11 3.66 8 8 0 01-3.52 2.31 13 13 0 01-4.83.87zm0-4a5.49 5.49 0 004.63-2 9.59 9.59 0 001.5-5.78 9.26 9.26 0 00-1.5-5.68 5.37 5.37 0 00-4.63-2 5.47 5.47 0 00-4.62 2 9.44 9.44 0 00-1.51 5.68 9.59 9.59 0 001.51 5.78 5.34 5.34 0 004.62 1.95zm12.43-19.02h5.57L94.92 74l3.82-15.41h5.12l4 15.41 3.52-15.6h5.23l-6.36 22.43h-4.72l-4.28-16.57-4.22 16.57h-4.62z" fill="#68aaff"/><path d="M119.54 58.39h8a13.44 13.44 0 014.32.57 7.41 7.41 0 012.71 1.54 5.23 5.23 0 011.41 2.22 7.83 7.83 0 01.4 2.6 8.67 8.67 0 01-.4 2.8 5.58 5.58 0 01-1.41 2.31A7.41 7.41 0 01131.9 72a13.84 13.84 0 01-4.32.58h-4.22v8.38h-3.92V58.39zm8 10.88a9.51 9.51 0 002.51-.29 4.25 4.25 0 001.51-.77 3.34 3.34 0 00.8-1.25 8.18 8.18 0 00.2-1.64 7.5 7.5 0 00-.2-1.64 2.45 2.45 0 00-.8-1.15 3.62 3.62 0 00-1.51-.68 8.73 8.73 0 00-2.41-.29h-4.12v7.71zm21.64 9.35a7.1 7.1 0 01-2.31 1.83 7 7 0 01-3.32.77 7.67 7.67 0 01-2.2-.29 5 5 0 01-1.81-.87 3.77 3.77 0 01-1.21-1.54 5.18 5.18 0 01-.4-2.22 4.89 4.89 0 01.8-2.79 5.59 5.59 0 012-1.64 12.16 12.16 0 012.82-.87 16.55 16.55 0 013.12-.29l2.51-.1V70a3.2 3.2 0 00-.9-2.61 3.75 3.75 0 00-2.41-.67 4.71 4.71 0 00-2.62.58 2.7 2.7 0 00-1.1 1.64l-3.42-.39a4.94 4.94 0 012.21-3.55 9.81 9.81 0 014.93-1 10.64 10.64 0 013.31.48 4.65 4.65 0 012.07 1.32 4.89 4.89 0 011.11 2.12 11.21 11.21 0 01.3 2.7v10.21h-3.62v-2.21zm-2.51-5.5a17 17 0 00-2.71.39 5 5 0 00-1.61.67 1.8 1.8 0 00-.7.87 3.51 3.51 0 00-.2 1.16 2 2 0 00.7 1.64 3.42 3.42 0 002.11.57 5.06 5.06 0 003.62-1.15 4.29 4.29 0 001.2-3.28V73zm9.85 10.6a5.69 5.69 0 001.91.29 2.11 2.11 0 001.5-.48 3.47 3.47 0 001-1.74l.6-1.54-7.13-15.8h4.32l4.72 11.76 4.32-11.76h4l-6.73 16.48c-.4 1-.8 1.83-1.11 2.5a4.94 4.94 0 01-1.2 1.83 5.75 5.75 0 01-1.47 1.16 4.75 4.75 0 01-2.21.38 9.14 9.14 0 01-1.61-.09 8.29 8.29 0 01-1.5-.39zm21.3-19.27v2.32a6.42 6.42 0 014.22-2.7 5.37 5.37 0 011.31-.1 4.4 4.4 0 012.81.87 5 5 0 011.61 2.16 6.86 6.86 0 015.53-3 5.19 5.19 0 014 1.45 7.15 7.15 0 011.3 4.62v10.76h-3.72V71a11.61 11.61 0 00-.2-2 3.71 3.71 0 00-.5-1.25 2.6 2.6 0 00-.8-.67 3.66 3.66 0 00-1.11-.2 3.21 3.21 0 00-1.71.39 5.9 5.9 0 00-1.3.87 5.37 5.37 0 00-.81 1.25 3.72 3.72 0 00-.3 1.44v9.83h-3.7v-10c0-1.45-.2-2.41-.7-2.89a2.39 2.39 0 00-1.81-.77 8.41 8.41 0 00-1.2.19 3.35 3.35 0 00-1.31.68 4.85 4.85 0 00-1.11 1.25 3.67 3.67 0 00-.5 1.93v9.73h-3.72V64.45zm39.89 11.47a6.53 6.53 0 01-2.21 4 8 8 0 01-5.12 1.44 8.17 8.17 0 01-6.13-2.26 8.91 8.91 0 01-2.11-6.36 11 11 0 01.6-3.76 8.84 8.84 0 011.71-2.79 6.89 6.89 0 012.61-1.74 9.33 9.33 0 013.32-.57 9.5 9.5 0 013.42.57 7.25 7.25 0 012.45 1.64 6.9 6.9 0 011.4 2.51 10.44 10.44 0 01.51 3.27v1.54h-12.3a5.17 5.17 0 001.2 3.57 4.41 4.41 0 003.42 1.35 3.8 3.8 0 002.61-.68 3.22 3.22 0 001.21-1.92h3.41zM214.3 71a4.49 4.49 0 00-1-3.18 3.8 3.8 0 00-3.11-1.16 4 4 0 00-3.12 1.16 5.14 5.14 0 00-1.2 3.18zm10.95-6.55v2.41a8.93 8.93 0 012.51-2.21 6.61 6.61 0 013-.68c3.82 0 5.73 2 5.73 6.07v10.79h-3.72V70.52a4.13 4.13 0 00-.7-2.79 2.7 2.7 0 00-2.22-.77 5.94 5.94 0 00-1.8.29 3.31 3.31 0 00-1.41.87 3.36 3.36 0 00-.91 1.34 3.Line truncated
@@ -13,13 +13,13 @@ import (
 	"strconv"
 	"strings"

-	"x-ui/logger"
-	"x-ui/util/common"
-	webpkg "x-ui/web"
-	"x-ui/web/locale"
-	"x-ui/web/middleware"
-	"x-ui/web/network"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	webpkg "github.com/mhsanaei/3x-ui/web"
+	"github.com/mhsanaei/3x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/middleware"
+	"github.com/mhsanaei/3x-ui/web/network"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/gin-gonic/gin"
 )
@@ -30,7 +30,7 @@ func setEmbeddedTemplates(engine *gin.Engine) error {
 		webpkg.EmbeddedHTML(),
 		"html/common/page.html",
 		"html/component/aThemeSwitch.html",
-		"html/subscription.html",
+		"html/settings/panel/subscription/subpage.html",
 	)
 	if err != nil {
 		return err
@@ -85,6 +85,12 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 		return nil, err
 	}

+	// Determine if JSON subscription endpoint is enabled
+	subJsonEnable, err := s.settingService.GetSubJsonEnable()
+	if err != nil {
+		return nil, err
+	}
+
 	// Set base_path based on LinksPath for template rendering
 	engine.Use(func(c *gin.Context) {
 		c.Set("base_path", LinksPath)
@@ -186,7 +192,7 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 	g := engine.Group("/")

 	s.sub = NewSUBController(
-		g, LinksPath, JsonPath, Encrypt, ShowInfo, RemarkModel, SubUpdates,
+		g, LinksPath, JsonPath, subJsonEnable, Encrypt, ShowInfo, RemarkModel, SubUpdates,
 		SubJsonFragment, SubJsonNoises, SubJsonMux, SubJsonRules, SubTitle)

 	return engine, nil
@@ -207,7 +213,7 @@ func (s *Server) getHtmlFiles() ([]string, error) {
 		files = append(files, theme)
 	}
 	// page itself
-	page := filepath.Join(dir, "web", "html", "subscription.html")
+	page := filepath.Join(dir, "web", "html", "subpage.html")
 	if _, err := os.Stat(page); err == nil {
 		files = append(files, page)
 	} else {
@@ -4,7 +4,8 @@ import (
 	"encoding/base64"
 	"fmt"
 	"strings"
-	"x-ui/config"
+
+	"github.com/mhsanaei/3x-ui/config"

 	"github.com/gin-gonic/gin"
 )
@@ -13,6 +14,7 @@ type SUBController struct {
 	subTitle       string
 	subPath        string
 	subJsonPath    string
+	jsonEnabled    bool
 	subEncrypt     bool
 	updateInterval string

@@ -24,6 +26,7 @@ func NewSUBController(
 	g *gin.RouterGroup,
 	subPath string,
 	jsonPath string,
+	jsonEnabled bool,
 	encrypt bool,
 	showInfo bool,
 	rModel string,
@@ -39,6 +42,7 @@ func NewSUBController(
 		subTitle:       subTitle,
 		subPath:        subPath,
 		subJsonPath:    jsonPath,
+		jsonEnabled:    jsonEnabled,
 		subEncrypt:     encrypt,
 		updateInterval: update,

@@ -51,10 +55,11 @@ func NewSUBController(

 func (a *SUBController) initRouter(g *gin.RouterGroup) {
 	gLink := g.Group(a.subPath)
-	gJson := g.Group(a.subJsonPath)
-
 	gLink.GET(":subid", a.subs)
-	gJson.GET(":subid", a.subJsons)
+	if a.jsonEnabled {
+		gJson := g.Group(a.subJsonPath)
+		gJson.GET(":subid", a.subJsons)
+	}
 }

 func (a *SUBController) subs(c *gin.Context) {
@@ -74,8 +79,11 @@ func (a *SUBController) subs(c *gin.Context) {
 		if strings.Contains(strings.ToLower(accept), "text/html") || c.Query("html") == "1" || strings.EqualFold(c.Query("view"), "html") {
 			// Build page data in service
 			subURL, subJsonURL := a.subService.BuildURLs(scheme, hostWithPort, a.subPath, a.subJsonPath, subId)
+			if !a.jsonEnabled {
+				subJsonURL = ""
+			}
 			page := a.subService.BuildPageData(subId, hostHeader, traffic, lastOnline, subs, subURL, subJsonURL)
-			c.HTML(200, "subscription.html", gin.H{
+			c.HTML(200, "subpage.html", gin.H{
 				"title":        "subscription.title",
 				"cur_ver":      config.GetVersion(),
 				"host":         page.Host,
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"strings"

-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/json_util"
-	"x-ui/util/random"
-	"x-ui/web/service"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/random"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 //go:embed default.json
@@ -11,13 +11,13 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/goccy/go-json"

-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/util/random"
-	"x-ui/web/service"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/random"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 type SubService struct {
@@ -1007,7 +1007,7 @@ func searchHost(headers any) string {
 	return ""
 }

-// PageData is a view model for subscription.html
+// PageData is a view model for subpage.html
 type PageData struct {
 	Host         string
 	BasePath     string
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"

-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 )

 func NewErrorf(format string, a ...any) error {
@@ -1 +1 @@
-:root{--color-primary-100:#008771;--dark-color-background:#0a1222;--dark-color-surface-100:#151f31;--dark-color-surface-200:#222d42;--dark-color-surface-300:#2c3950;--dark-color-surface-400:rgba(65, 85, 119, 0.5);--dark-color-surface-500:#2c3950;--dark-color-surface-600:#313f5a;--dark-color-surface-700:#111929;--dark-color-surface-700-rgb:17, 25, 41;--dark-color-table-hover:rgba(44, 57, 80, 0.2);--dark-color-text-primary:rgba(255, 255, 255, 0.75);--dark-color-stroke:#2c3950;--dark-color-btn-danger:#cd3838;--dark-color-btn-danger-border:transparent;--dark-color-btn-danger-hover:#e94b4b;--dark-color-tag-bg:rgba(255, 255, 255, 0.05);--dark-color-tag-border:rgba(255, 255, 255, 0.15);--dark-color-tag-color:rgba(255, 255, 255, 0.75);--dark-color-tag-green-bg:17, 36, 33;--dark-color-tag-green-border:25, 81, 65;--dark-color-tag-green-color:#3ad3ba;--dark-color-tag-purple-bg:#201425;--dark-color-tag-purple-border:#5a2969;--dark-color-tag-purple-color:#d988cd;--dark-color-tag-red-bg:#291515;--dark-color-tag-red-border:#5c2626;--dark-color-tag-red-color:#e04141;--dark-color-tag-orange-bg:#312313;--dark-color-tag-orange-border:#593914;--dark-color-tag-orange-color:#ffa031;--dark-color-tag-blue-bg:#111a2c;--dark-color-tag-blue-border:#1348ab;--dark-color-tag-blue-color:#529fff;--dark-color-codemirror-line-hover:rgba(0, 135, 113, 0.2);--dark-color-codemirror-line-selection:rgba(0, 135, 113, 0.3);--dark-color-login-background:var(--dark-color-background);--dark-color-login-wave:var(--dark-color-surface-200);--dark-color-tooltip:rgba(61, 76, 104, 0.9);--dark-color-back-top:rgba(61, 76, 104, 0.9);--dark-color-back-top-hover:rgba(61, 76, 104, 1);--dark-color-scrollbar:#313f5a;--dark-color-scrollbar-webkit:#7484a0;--dark-color-scrollbar-webkit-hover:#90a4c7;--dark-color-table-ring:rgb(38 52 77);--dark-color-spin-container:#151f31}html[data-theme-animations='off']{.ant-menu,.ant-layout-sider,.ant-card,.ant-tag,.ant-progress-circle>*,.ant-input,.ant-table-row-expand-icon,.ant-switch,.ant-table-thead>tr>th,.ant-select-selection,.ant-btn,.ant-input-number,.ant-input-group-addon,.ant-checkbox-inner,.ant-progress-bg,.ant-progress-success-bg,.ant-radio-button-wrapper:not(:first-child):before,.ant-radio-button-wrapper,#login,.cm-s-xq.CodeMirror{transition:border 0s,background 0s!important}.ant-menu.ant-menu-inline .ant-menu-item:not(.ant-menu-sub .ant-menu-item),.ant-layout-sider-trigger,.ant-alert-close-icon .anticon-close,.ant-tabs-nav .ant-tabs-tab,.ant-input-number-input,.ant-collapse>.ant-collapse-item>.ant-collapse-header,.Line-Hover,.ant-menu-theme-switch,.ant-menu-submenu-title{transition:color 0s!important}.wave-btn-bg{transition:width 0s!important}}html[data-theme='ultra-dark']{--dark-color-background:#21242a;--dark-color-surface-100:#0c0e12;--dark-color-surface-200:#222327;--dark-color-surface-300:#32353b;--dark-color-surface-400:rgba(255, 255, 255, 0.1);--dark-color-surface-500:#3b404b;--dark-color-surface-600:#505663;--dark-color-surface-700:#101113;--dark-color-surface-700-rgb:16, 17, 19;--dark-color-table-hover:rgba(89, 89, 89, 0.15);--dark-color-text-primary:rgb(255 255 255 / 85%);--dark-color-stroke:#202025;--dark-color-tag-green-bg:17, 36, 33;--dark-color-tag-green-border:29, 95, 77;--dark-color-tag-green-color:#59cbac;--dark-color-tag-purple-bg:#241121;--dark-color-tag-purple-border:#5a2969;--dark-color-tag-purple-color:#d686ca;--dark-color-tag-red-bg:#2a1215;--dark-color-tag-red-border:#58181c;--dark-color-tag-red-color:#e84749;--dark-color-tag-orange-bg:#2b1d11;--dark-color-tag-orange-border:#593815;--dark-color-tag-orange-color:#e89a3c;--dark-color-tag-blue-bg:#111a2c;--dark-color-tag-blue-border:#0f367e;--dark-color-tag-blue-color:#3c89e8;--dark-color-codemirror-line-hover:rgba(82, 84, 94, 0.2);--dark-color-codemirror-line-selection:rgba(82, 84, 94, 0.3);--dark-color-login-background:#0a2227;--dark-color-login-wave:#0f2d32;--dark-color-tooltip:rgba(88, 93, 100, 0.9);--dark-color-back-top:rgba(88, 93, 100, 0.9);--dark-color-back-top-hover:rgba(88, 93, 100, 1);--dark-color-scrollbar:rgb(107,107,107);--dark-color-scrollbar-webkit:#9f9f9f;--dark-color-scrollbar-webkit-hover:#d1d1d1;--dark-color-table-ring:rgb(37 39 42);--dark-color-spin-container:#1d1d1d;.ant-dropdown-menu-dark,.dark .ant-dropdown-menu{background-color:var(--dark-color-surface-500)}.dark .ant-dropdown-menu-submenu-title:hover,.dark .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled),.dark .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled){background-color:rgb(0 93 78 / .3)}.dark .waves-header{background-color:#0a2227}.dark .ant-calendar-year-panel-year:hover,.dark .ant-calendar-month-panel-month:hover,.dark .ant-calendar-decade-panel-decade:hover{background-color:var(--dark-color-surface-600)}}html,body{height:100vh;width:100vw;margin:0;padding:0;overflow:hidden}body{color:rgb(0 0 0 / .65);font-size:14px;font-variant:tabular-nums;line-height:1.5;background-color:#fff;font-feature-settinLine truncated
+:root{--color-primary-100:#008771;--dark-color-background:#0a1222;--dark-color-surface-100:#151f31;--dark-color-surface-200:#222d42;--dark-color-surface-300:#2c3950;--dark-color-surface-400:rgba(65, 85, 119, 0.5);--dark-color-surface-500:#2c3950;--dark-color-surface-600:#313f5a;--dark-color-surface-700:#111929;--dark-color-surface-700-rgb:17, 25, 41;--dark-color-table-hover:rgba(44, 57, 80, 0.2);--dark-color-text-primary:rgba(255, 255, 255, 0.75);--dark-color-stroke:#2c3950;--dark-color-btn-danger:#cd3838;--dark-color-btn-danger-border:transparent;--dark-color-btn-danger-hover:#e94b4b;--dark-color-tag-bg:rgba(255, 255, 255, 0.05);--dark-color-tag-border:rgba(255, 255, 255, 0.15);--dark-color-tag-color:rgba(255, 255, 255, 0.75);--dark-color-tag-green-bg:17, 36, 33;--dark-color-tag-green-border:25, 81, 65;--dark-color-tag-green-color:#3ad3ba;--dark-color-tag-purple-bg:#201425;--dark-color-tag-purple-border:#5a2969;--dark-color-tag-purple-color:#d988cd;--dark-color-tag-red-bg:#291515;--dark-color-tag-red-border:#5c2626;--dark-color-tag-red-color:#e04141;--dark-color-tag-orange-bg:#312313;--dark-color-tag-orange-border:#593914;--dark-color-tag-orange-color:#ffa031;--dark-color-tag-blue-bg:#111a2c;--dark-color-tag-blue-border:#1348ab;--dark-color-tag-blue-color:#529fff;--dark-color-codemirror-line-hover:rgba(0, 135, 113, 0.2);--dark-color-codemirror-line-selection:rgba(0, 135, 113, 0.3);--dark-color-login-background:var(--dark-color-background);--dark-color-login-wave:var(--dark-color-surface-200);--dark-color-tooltip:rgba(61, 76, 104, 0.9);--dark-color-back-top:rgba(61, 76, 104, 0.9);--dark-color-back-top-hover:rgba(61, 76, 104, 1);--dark-color-scrollbar:#313f5a;--dark-color-scrollbar-webkit:#7484a0;--dark-color-scrollbar-webkit-hover:#90a4c7;--dark-color-table-ring:rgb(38 52 77);--dark-color-spin-container:#151f31}html[data-theme-animations='off']{.ant-menu,.ant-layout-sider,.ant-card,.ant-tag,.ant-progress-circle>*,.ant-input,.ant-table-row-expand-icon,.ant-switch,.ant-table-thead>tr>th,.ant-select-selection,.ant-btn,.ant-input-number,.ant-input-group-addon,.ant-checkbox-inner,.ant-progress-bg,.ant-progress-success-bg,.ant-radio-button-wrapper:not(:first-child):before,.ant-radio-button-wrapper,#login,.cm-s-xq.CodeMirror{transition:border 0s,background 0s!important}.ant-menu.ant-menu-inline .ant-menu-item:not(.ant-menu-sub .ant-menu-item),.ant-layout-sider-trigger,.ant-alert-close-icon .anticon-close,.ant-tabs-nav .ant-tabs-tab,.ant-input-number-input,.ant-collapse>.ant-collapse-item>.ant-collapse-header,.Line-Hover,.ant-menu-theme-switch,.ant-menu-submenu-title{transition:color 0s!important}.wave-btn-bg{transition:width 0s!important}}html[data-theme='ultra-dark']{--dark-color-background:#21242a;--dark-color-surface-100:#0c0e12;--dark-color-surface-200:#222327;--dark-color-surface-300:#32353b;--dark-color-surface-400:rgba(255, 255, 255, 0.1);--dark-color-surface-500:#3b404b;--dark-color-surface-600:#505663;--dark-color-surface-700:#101113;--dark-color-surface-700-rgb:16, 17, 19;--dark-color-table-hover:rgba(89, 89, 89, 0.15);--dark-color-text-primary:rgb(255 255 255 / 85%);--dark-color-stroke:#202025;--dark-color-tag-green-bg:17, 36, 33;--dark-color-tag-green-border:29, 95, 77;--dark-color-tag-green-color:#59cbac;--dark-color-tag-purple-bg:#241121;--dark-color-tag-purple-border:#5a2969;--dark-color-tag-purple-color:#d686ca;--dark-color-tag-red-bg:#2a1215;--dark-color-tag-red-border:#58181c;--dark-color-tag-red-color:#e84749;--dark-color-tag-orange-bg:#2b1d11;--dark-color-tag-orange-border:#593815;--dark-color-tag-orange-color:#e89a3c;--dark-color-tag-blue-bg:#111a2c;--dark-color-tag-blue-border:#0f367e;--dark-color-tag-blue-color:#3c89e8;--dark-color-codemirror-line-hover:rgba(82, 84, 94, 0.2);--dark-color-codemirror-line-selection:rgba(82, 84, 94, 0.3);--dark-color-login-background:#0a2227;--dark-color-login-wave:#0f2d32;--dark-color-tooltip:rgba(88, 93, 100, 0.9);--dark-color-back-top:rgba(88, 93, 100, 0.9);--dark-color-back-top-hover:rgba(88, 93, 100, 1);--dark-color-scrollbar:rgb(107,107,107);--dark-color-scrollbar-webkit:#9f9f9f;--dark-color-scrollbar-webkit-hover:#d1d1d1;--dark-color-table-ring:rgb(37 39 42);--dark-color-spin-container:#1d1d1d;.ant-dropdown-menu-dark,.dark .ant-dropdown-menu{background-color:var(--dark-color-surface-500)}.dark .ant-dropdown-menu-submenu-title:hover,.dark .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled),.dark .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled){background-color:rgb(0 93 78 / .3)}.dark .waves-header{background-color:#0a2227}.dark .ant-calendar-year-panel-year:hover,.dark .ant-calendar-month-panel-month:hover,.dark .ant-calendar-decade-panel-decade:hover{background-color:var(--dark-color-surface-600)}}html,body{height:100vh;width:100vw;margin:0;padding:0;overflow:hidden}body{color:rgb(0 0 0 / .65);font-size:14px;font-variant:tabular-nums;line-height:1.5;background-color:#fff;font-feature-settinLine truncated
@@ -26,7 +26,8 @@ class AllSetting {
        this.twoFactorEnable = false;
        this.twoFactorToken = "";
        this.xrayTemplateConfig = "";
-        this.subEnable = false;
+        this.subEnable = true;
+        this.subJsonEnable = false;
        this.subTitle = "";
        this.subListen = "";
        this.subPort = 2096;
@@ -50,7 +50,11 @@
  }

  function drawQR(value) {
-    try { new QRious({ element: document.getElementById('qrcode'), value, size: 220 }); } catch (e) { console.warn(e); }
+    try {
+      new QRious({ element: document.getElementById('qrcode'), value, size: 220 });
+    } catch (e) {
+      console.warn(e);
+    }
  }

  // Try to extract a human label (email/ps) from different link types
@@ -61,22 +65,18 @@
        if (json.ps) return json.ps;
        if (json.add && json.id) return json.add; // fallback host
      } else if (link.startsWith('vless://') || link.startsWith('trojan://')) {
-        // vless://<id>@host:port?...#name
        const hashIdx = link.indexOf('#');
        if (hashIdx !== -1) return decodeURIComponent(link.substring(hashIdx + 1));
-        // email sometimes in query params like sni or remark
        const qIdx = link.indexOf('?');
        if (qIdx !== -1) {
          const qs = new URL('http://x/?' + link.substring(qIdx + 1, hashIdx !== -1 ? hashIdx : undefined)).searchParams;
          if (qs.get('remark')) return qs.get('remark');
          if (qs.get('email')) return qs.get('email');
        }
-        // else take user@host
        const at = link.indexOf('@');
        const protSep = link.indexOf('://');
        if (at !== -1 && protSep !== -1) return link.substring(protSep + 3, at);
      } else if (link.startsWith('ss://')) {
-        // shadowsocks: label often after #
        const hashIdx = link.indexOf('#');
        if (hashIdx !== -1) return decodeURIComponent(link.substring(hashIdx + 1));
      }
@@ -96,14 +96,16 @@
    },
    async mounted() {
      this.lang = LanguageManager.getLanguage();
-      // Discover subJsonUrl if provided via template bootstrap
      const tpl = document.getElementById('subscription-data');
      const sj = tpl ? tpl.getAttribute('data-subjson-url') : '';
      if (sj) this.app.subJsonUrl = sj;
      drawQR(this.app.subUrl);
-      // Draw second QR if available
-      try { new QRious({ element: document.getElementById('qrcode-subjson'), value: this.app.subJsonUrl || '', size: 220 }); } catch (e) { /* ignore */ }
-      // Track viewport width for responsive behavior
+      try {
+        const elJson = document.getElementById('qrcode-subjson');
+        if (elJson && this.app.subJsonUrl) {
+          new QRious({ element: elJson, value: this.app.subJsonUrl, size: 220 });
+        }
+      } catch (e) { /* ignore */ }
      this._onResize = () => { this.viewportWidth = window.innerWidth; };
      window.addEventListener('resize', this._onResize);
    },
@@ -111,15 +113,45 @@
      if (this._onResize) window.removeEventListener('resize', this._onResize);
    },
    computed: {
-      isMobile() { return this.viewportWidth < 576; },
-      isUnlimited() { return !this.app.totalByte; },
+      isMobile() {
+        return this.viewportWidth < 576;
+      },
+      isUnlimited() {
+        return !this.app.totalByte;
+      },
      isActive() {
        const now = Date.now();
        const expiryOk = !this.app.expireMs || this.app.expireMs >= now;
        const trafficOk = !this.app.totalByte || (this.app.uploadByte + this.app.downloadByte) <= this.app.totalByte;
        return expiryOk && trafficOk;
      },
+      shadowrocketUrl() {
+        const rawUrl = this.app.subUrl + '?flag=shadowrocket';
+        const base64Url = btoa(rawUrl);
+        const remark = encodeURIComponent(this.app.sId || 'Subscription');
+        return `shadowrocket://add/sub/${base64Url}?remark=${remark}`;
+      },
+      v2boxUrl() {
+        return `v2box://install-sub?url=${encodeURIComponent(this.app.subUrl)}&name=${encodeURIComponent(this.app.sId)}`;
+      },
+      streisandUrl() {
+        return `streisand://import/${encodeURIComponent(this.app.subUrl)}`;
+      },
+      v2raytunUrl() {
+        return this.app.subUrl; 
+      },
+      npvtunUrl() {
+        return this.app.subUrl; 
+      }
+    },
+    methods: {
+      renderLink,
+      copy,
+      open,
+      linkName,
+      i18nLabel(key) {
+        return '{{ i18n "' + key + '" }}';
+      },
    },
-    methods: { renderLink, copy, open, linkName, i18nLabel(key) { return '{{ i18n "' + key + '" }}'; } },
  });
 })();
@@ -1,7 +1,7 @@
 package controller

 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/gin-gonic/gin"
 )
@@ -3,9 +3,9 @@ package controller
 import (
 	"net/http"

-	"x-ui/logger"
-	"x-ui/web/locale"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/session"

 	"github.com/gin-gonic/gin"
 )
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strconv"

-	"x-ui/database/model"
-	"x-ui/web/service"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/session"

 	"github.com/gin-gonic/gin"
 )
@@ -5,18 +5,18 @@ import (
 	"text/template"
 	"time"

-	"x-ui/logger"
-	"x-ui/web/service"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/session"

 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 )

 type LoginForm struct {
-	Username    	string `json:"username" form:"username"`
-	Password    	string `json:"password" form:"password"`
-	TwoFactorCode	string `json:"twoFactorCode" form:"twoFactorCode"`
+	Username      string `json:"username" form:"username"`
+	Password      string `json:"password" form:"password"`
+	TwoFactorCode string `json:"twoFactorCode" form:"twoFactorCode"`
 }

 type IndexController struct {
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"time"

-	"x-ui/web/global"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/global"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/gin-gonic/gin"
 )
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"time"

-	"x-ui/util/crypto"
-	"x-ui/web/entity"
-	"x-ui/web/service"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/web/entity"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/session"

 	"github.com/gin-gonic/gin"
 )
@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"strings"

-	"x-ui/config"
-	"x-ui/logger"
-	"x-ui/web/entity"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/web/entity"

 	"github.com/gin-gonic/gin"
 )
@@ -1,7 +1,7 @@
 package controller

 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/gin-gonic/gin"
 )
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"

-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
 )

 type Msg struct {
@@ -42,6 +42,7 @@ type AllSetting struct {
 	TwoFactorEnable             bool   `json:"twoFactorEnable" form:"twoFactorEnable"`
 	TwoFactorToken              string `json:"twoFactorToken" form:"twoFactorToken"`
 	SubEnable                   bool   `json:"subEnable" form:"subEnable"`
+	SubJsonEnable               bool   `json:"subJsonEnable" form:"subJsonEnable"`
 	SubTitle                    string `json:"subTitle" form:"subTitle"`
 	SubListen                   string `json:"subListen" form:"subListen"`
 	SubPort                     int    `json:"subPort" form:"subPort"`
@@ -37,7 +37,7 @@
    <template slot="content" >
      {{ i18n "lastOnline" }}: [[ formatLastOnline(client.email) ]]
    </template>
-    <template v-if="client.enable && isClientOnline(client.email) && !isClientDepleted">
+    <template v-if="client.enable && isClientOnline(client.email)">
      <a-tag color="green">{{ i18n "online" }}</a-tag>
    </template>
    <template v-else>
@@ -49,9 +49,9 @@
  <a-space direction="horizontal" :size="2">
    <a-tooltip>
      <template slot="title">
-        <template v-if="isClientDepleted">{{ i18n "depleted" }}</template>
-        <template v-if="!isClientDepleted && !client.enable">{{ i18n "disabled" }}</template>
-        <template v-if="!isClientDepleted && client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
+        <template v-if="isClientDepleted(record, client.email)">{{ i18n "depleted" }}</template>
+        <template v-else-if="!client.enable">{{ i18n "disabled" }}</template>
+        <template v-else-if="client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
      </template>
      <a-badge :class="isClientOnline(client.email)? 'online-animation' : ''" :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-badge>
    </a-tooltip>
@@ -90,7 +90,7 @@
          <a-progress :stroke-color="themeSwitcher.isDarkTheme ? 'rgb(72 84 105)' : '#bcbcbc'" :show-info="false" :percent="statsProgress(record, client.email)" />
        </td>
        <td class="tr-table-bar" v-else-if="client.totalGB > 0">
-          <a-progress :stroke-color="clientStatsColor(record, client.email)" :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="statsProgress(record, client.email)" />
+          <a-progress :stroke-color="clientStatsColor(record, client.email)" :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="statsProgress(record, client.email)" />
        </td>
        <td v-else class="infinite-bar tr-table-bar">
          <a-progress :show-info="false" :percent="100"></a-progress>
@@ -126,7 +126,7 @@
        <tr class="tr-table-box">
          <td class="tr-table-rt"> [[ remainedDays(client.expiryTime) ]] </td>
          <td class="infinite-bar tr-table-bar">
-            <a-progress :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
+            <a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
          </td>
          <td class="tr-table-lt">[[ client.reset + "d" ]]</td>
        </tr>
@@ -213,7 +213,7 @@
                  </tr>
                </table>
              </template>
-              <a-progress :stroke-color="clientStatsColor(record, client.email)" :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="statsProgress(record, client.email)" />
+              <a-progress :stroke-color="clientStatsColor(record, client.email)" :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="statsProgress(record, client.email)" />
            </a-popover>
          </td>
          <td width="120px" v-else class="infinite-bar">
@@ -247,7 +247,7 @@
                    </template>
                  </span>
                </template>
-                <a-progress :show-info="false" :status="isClientEnabled(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
+                <a-progress :show-info="false" :status="isClientDepleted(record, client.email)? 'exception' : ''" :percent="expireProgress(client.expiryTime, client.reset)" />
              </a-popover>
            </td>
            <td width="60px">[[ client.reset + "d" ]]</td>
@@ -568,8 +568,7 @@
                            <tr>
                              <td>{{ i18n "pages.inbounds.periodicTrafficResetTitle" }}</td>
                              <td>
-                                <a-tag color="blue">[[ i18n("pages.inbounds.periodicTrafficReset." +
-                                  dbInbound.trafficReset) ]]</a-tag>
+                                <a-tag color="blue">[[ dbInbound.trafficReset ]]</a-tag>
                              </td>
                            </tr>
                          </table>
@@ -737,10 +736,11 @@
      refreshing: false,
      refreshInterval: Number(localStorage.getItem("refreshInterval")) || 5000,
      subSettings: {
-        enable: false,
+        enable: true,
        subTitle: '',
        subURI: '',
        subJsonURI: '',
+        subJsonEnable: false,
      },
      remarkModel: '-ieo',
      datepicker: 'gregorian',
@@ -796,7 +796,8 @@
            enable: subEnable,
            subTitle: subTitle,
            subURI: subURI,
-            subJsonURI: subJsonURI
+            subJsonURI: subJsonURI,
+            subJsonEnable: subJsonEnable,
          };
          this.pageSize = pageSize;
          this.remarkModel = remarkModel;
@@ -1433,15 +1434,19 @@
        clientStats = dbInbound.clientStats ? dbInbound.clientStats.find(stats => stats.email === email) : null;
        return clientStats ? clientStats['enable'] : true;
      },
-      // Returns true when client's traffic is exhausted or expiry time is passed
      isClientDepleted(dbInbound, email) {
        if (!email || !dbInbound || !dbInbound.clientStats) return false;
        const stats = dbInbound.clientStats.find(s => s.email === email);
        if (!stats) return false;
-        const now = new Date().getTime();
-        const exhausted = stats.total > 0 && (stats.up + stats.down) >= stats.total;
-        const expired = stats.expiryTime > 0 && now >= stats.expiryTime;
-        return exhausted || expired;
+        const total = stats.total ?? 0;
+        const used = (stats.up ?? 0) + (stats.down ?? 0);
+        const hasTotal = total > 0;
+        const exhausted = hasTotal && used >= total;
+        const expiryTime = stats.expiryTime ?? 0;
+        const hasExpiry = expiryTime > 0;
+        const now = Date.now();
+        const expired = hasExpiry && expiryTime <= now;
+        return expired || exhausted;
      },
      isClientOnline(email) {
        return this.onlineClients.includes(email);
@@ -431,12 +431,12 @@
      CPU History
      <a-select size="small" v-model="cpuHistoryModal.bucket" class="ml-10" style="width: 80px"
        @change="fetchCpuHistoryBucket">
-        <a-select-option :value="2">2s</a-select-option>
-        <a-select-option :value="30">30s</a-select-option>
-        <a-select-option :value="60">1m</a-select-option>
-        <a-select-option :value="120">2m</a-select-option>
-        <a-select-option :value="180">3m</a-select-option>
-        <a-select-option :value="300">5m</a-select-option>
+        <a-select-option :value="2">2m</a-select-option>
+        <a-select-option :value="30">30m</a-select-option>
+        <a-select-option :value="60">1h</a-select-option>
+        <a-select-option :value="120">2h</a-select-option>
+        <a-select-option :value="180">3h</a-select-option>
+        <a-select-option :value="300">5h</a-select-option>
      </a-select>
    </template>
    <div style="padding:16px">
@@ -538,7 +538,7 @@
        const h = this.drawHeight
        const w = this.drawWidth
        // draw at 25%, 50%, 75%
-        return [0.25, 0.5, 0.75]
+        return [0, 0.25, 0.5, 0.75, 1]
          .map(r => Math.round(this.paddingTop + h * r))
          .map(y => ({ x1: this.paddingLeft, y1: y, x2: this.paddingLeft + w, y2: y }))
      },
@@ -622,7 +622,7 @@
          </g>
          <!-- X ticks/labels -->
          <g v-for="(t,i) in xTicks" :key="'x'+i">
-            <text class="cpu-grid-x-text" :x="t.x" :y="paddingTop + drawHeight + 14" text-anchor="middle" font-size="10" fill="rgba(0,0,0,0.3)" v-text="t.label"></text>
+            <text class="cpu-grid-x-text" :x="t.x" :y="paddingTop + drawHeight + 22" text-anchor="middle" font-size="10" fill="rgba(0,0,0,0.3)" v-text="t.label"></text>
          </g>
        </g>
        <path v-if="areaPath" :d="areaPath" fill="url(#spkGrad)" stroke="none" />
@@ -1124,4 +1124,4 @@
    },
  });
 </script>
-{{ template "page/body_end" .}}
+{{ template "page/body_end" .}}
@@ -180,9 +180,9 @@
        <tr>
          <td>{{ i18n "status" }}</td>
          <td>
-            <a-tag v-if="isEnable && isActive && !isDepleted" color="green">{{ i18n "enabled" }}</a-tag>
-            <a-tag v-if="!isEnable && !isDepleted">{{ i18n "disabled" }}</a-tag>
            <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">
@@ -308,7 +308,7 @@
          </tr-info-title>
          <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a>
        </tr-info-row>
-        <tr-info-row class="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" }}'>
@@ -524,7 +524,7 @@
      this.dbInbound = new DBInbound(dbInbound);
      this.clientSettings = this.inbound.clients ? this.inbound.clients[index] : null;
      this.isExpired = this.inbound.clients ? this.inbound.isExpiry(index) : this.dbInbound.isExpiry;
-      this.clientStats = this.inbound.clients ? this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) : [];
+      this.clientStats = this.inbound.clients ? (this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) || null) : null;

      if (
        [
@@ -548,7 +548,7 @@
      if (this.clientSettings) {
        if (this.clientSettings.subId) {
          this.subLink = this.genSubLink(this.clientSettings.subId);
-          this.subJsonLink = this.genSubJsonLink(this.clientSettings.subId);
+          this.subJsonLink = app.subSettings.subJsonEnable ? this.genSubJsonLink(this.clientSettings.subId) : '';
        }
      }
      this.visible = true;
@@ -588,11 +588,21 @@
        return infoModal.dbInbound.isEnable;
      },
      get isDepleted() {
-        const stats = this.infoModal.clientStats;
-        if (!stats) return false;
-        const now = new Date().getTime();
-        const expired = stats.expiryTime > 0 && now >= stats.expiryTime;
-        const exhausted = stats.total > 0 && (stats.up + stats.down) >= stats.total;
+        const stats = infoModal.clientStats;
+        const settings = infoModal.clientSettings;
+        if (!stats || !settings) {
+          return false;
+        }
+        const total = stats.total ?? 0;
+        const used = (stats.up ?? 0) + (stats.down ?? 0);
+        const hasTotal = total > 0;
+        const exhausted = hasTotal && used >= total;
+
+        const expiryTime = settings.expiryTime ?? 0;
+        const hasExpiry = expiryTime > 0;
+        const now = Date.now();
+        const expired = hasExpiry && now >= expiryTime;
+
        return expired || exhausted;
      },
    },
@@ -30,7 +30,7 @@
          </tr-qr-bg-inner>
        </tr-qr-bg>
      </tr-qr-box>
-      <tr-qr-box class="qr-box">
+      <tr-qr-box class="qr-box" v-if="app.subSettings.subJsonEnable">
        <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}} Json</span></a-tag>
        <tr-qr-bg class="qr-bg-sub">
          <tr-qr-bg-inner class="qr-bg-sub-inner">
@@ -262,7 +262,9 @@
      if (qrModal.client && qrModal.client.subId) {
        qrModal.subId = qrModal.client.subId;
        this.setQrCode("qrCode-sub", this.genSubLink(qrModal.subId));
-        this.setQrCode("qrCode-subJson", this.genSubJsonLink(qrModal.subId));
+        if (app.subSettings.subJsonEnable) {
+          this.setQrCode("qrCode-subJson", this.genSubJsonLink(qrModal.subId));
+        }
      }
      qrModal.qrcodes.forEach((element, index) => {
        this.setQrCode("qrCode-" + index, element.link);
@@ -79,7 +79,7 @@
                    </template>
                    {{ template "settings/panel/subscription/general" . }}
                  </a-tab-pane>
-                  <a-tab-pane key="5" v-if="allSetting.subEnable" :style="{ paddingTop: '20px' }">
+                  <a-tab-pane key="5" v-if="allSetting.subJsonEnable" :style="{ paddingTop: '20px' }">
                    <template #tab>
                      <a-icon type="code"></a-icon>
                      <span>{{ i18n "pages.settings.subSettings" }} (JSON)</span>
@@ -523,6 +523,8 @@
          if (this.allSetting.subEnable) {
            subPath = this.allSetting.subURI.length > 0 ? new URL(this.allSetting.subURI).pathname : this.allSetting.subPath;
            if (subPath == '/sub/') alerts.push('{{ i18n "secAlertSubURI" }}');
+          }
+          if (this.allSetting.subJsonEnable) {
            subJsonPath = this.allSetting.subJsonURI.length > 0 ? new URL(this.allSetting.subJsonURI).pathname : this.allSetting.subJsonPath;
            if (subJsonPath == '/json/') alerts.push('{{ i18n "secAlertSubJsonURI" }}');
          }
@@ -8,6 +8,13 @@
                <a-switch v-model="allSetting.subEnable"></a-switch>
            </template>
        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>JSON Subscription</template>
+            <template #description>{{ i18n "pages.settings.subJsonEnable"}}</template>
+            <template #control>
+                <a-switch v-model="allSetting.subJsonEnable"></a-switch>
+            </template>
+        </a-setting-list-item>
        <a-setting-list-item paddings="small">
            <template #title>{{ i18n "pages.settings.subTitle"}}</template>
            <template #description>{{ i18n "pages.settings.subTitleDesc"}}</template>
@@ -56,7 +56,7 @@
                            <a-space direction="vertical" align="center">
                                <a-row type="flex" :gutter="[8,8]"
                                    justify="center" style="width:100%">
-                                    <a-col :xs="24" :sm="12"
+                                    <a-col :xs="24" :sm="app.subJsonUrl ? 12 : 24"
                                        style="text-align:center;">
                                        <tr-qr-box class="qr-box">
                                            <a-tag color="purple"
@@ -75,7 +75,7 @@
                                            </tr-qr-bg>
                                        </tr-qr-box>
                                    </a-col>
-                                    <a-col :xs="24" :sm="12"
+                                    <a-col v-if="app.subJsonUrl" :xs="24" :sm="12"
                                        style="text-align:center;">
                                        <tr-qr-box class="qr-box">
                                            <a-tag color="purple"
@@ -233,16 +233,17 @@
                                        <a-menu slot="overlay"
                                            :class="themeSwitcher.currentTheme">
                                            <a-menu-item key="ios-shadowrocket"
-                                                @click="open('shadowrocket://add/subscription?url=' + encodeURIComponent(app.subUrl) + '&remark=' + encodeURIComponent(app.sId))">Shadowrocket</a-menu-item>
+                                                @click="open(shadowrocketUrl)">Shadowrocket</a-menu-item>
                                            <a-menu-item key="ios-v2box"
-                                                @click="open('v2box://install-sub?url=' + encodeURIComponent(app.subUrl) + '&name=' + encodeURIComponent(app.sId))">V2Box</a-menu-item>
+                                                @click="open(v2boxUrl)">V2Box</a-menu-item>
                                            <a-menu-item key="ios-streisand"
-                                                @click="open('streisand://import/' + encodeURIComponent(app.subUrl))">Streisand</a-menu-item>
+                                                @click="open(streisandUrl)">Streisand</a-menu-item>
                                            <a-menu-item key="ios-v2raytun"
-                                                @click="copy(app.subUrl)">V2RayTun</a-menu-item>
+                                                @click="copy(v2raytunUrl)">V2RayTun</a-menu-item>
                                            <a-menu-item key="ios-npvtunnel"
-                                                @click="copy(app.subUrl)">NPV
-                                                Tunnel</a-menu-item>
+                                                @click="copy(npvtunUrl)">NPV
+                                                Tunnel
+                                            </a-menu-item>
                                        </a-menu>
                                    </a-dropdown>
                                </a-col>
@@ -12,10 +12,10 @@ import (
 	"sort"
 	"time"

-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 type CheckClientIpJob struct {
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"

-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/shirou/gopsutil/v4/cpu"
 )
@@ -1,7 +1,7 @@
 package job

 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 )

 type CheckHashStorageJob struct {
@@ -1,8 +1,8 @@
 package job

 import (
-	"x-ui/logger"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/web/service"
 )

 type CheckXrayRunningJob struct {
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"

-	"x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 type ClearLogsJob struct{}
@@ -1,8 +1,8 @@
 package job

 import (
-	"x-ui/logger"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/web/service"
 )

 type Period string
@@ -20,12 +20,16 @@ func NewPeriodicTrafficResetJob(period Period) *PeriodicTrafficResetJob {

 func (j *PeriodicTrafficResetJob) Run() {
 	inbounds, err := j.inboundService.GetInboundsByTrafficReset(string(j.period))
-	logger.Infof("Running periodic traffic reset job for period: %s", j.period)
 	if err != nil {
 		logger.Warning("Failed to get inbounds for traffic reset:", err)
 		return
 	}

+	if len(inbounds) == 0 {
+		return
+	}
+	logger.Infof("Running periodic traffic reset job for period: %s (%d matching inbounds)", j.period, len(inbounds))
+
 	resetCount := 0

 	for _, inbound := range inbounds {
@@ -1,7 +1,7 @@
 package job

 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 )

 type LoginStatus byte
@@ -2,9 +2,10 @@ package job

 import (
 	"encoding/json"
-	"x-ui/logger"
-	"x-ui/web/service"
-	"x-ui/xray"
+
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/xray"

 	"github.com/valyala/fasthttp"
 )
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"

-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"

 	"github.com/gin-gonic/gin"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"

-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/xray"

 	"gorm.io/gorm"
 )
@@ -1,10 +1,10 @@
 package service

 import (
-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/xray"

 	"gorm.io/gorm"
 )
@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"time"

-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 )

 type PanelService struct{}
@@ -19,12 +19,12 @@ import (
 	"sync"
 	"time"

-	"x-ui/config"
-	"x-ui/database"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/util/sys"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/sys"
+	"github.com/mhsanaei/3x-ui/xray"

 	"github.com/google/uuid"
 	"github.com/shirou/gopsutil/v4/cpu"
@@ -10,14 +10,14 @@ import (
 	"strings"
 	"time"

-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/util/random"
-	"x-ui/util/reflect_util"
-	"x-ui/web/entity"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/random"
+	"github.com/mhsanaei/3x-ui/util/reflect_util"
+	"github.com/mhsanaei/3x-ui/web/entity"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 //go:embed config.json
@@ -50,7 +50,8 @@ var defaultValueMap = map[string]string{
 	"tgLang":                      "en-US",
 	"twoFactorEnable":             "false",
 	"twoFactorToken":              "",
-	"subEnable":                   "false",
+	"subEnable":                   "true",
+	"subJsonEnable":               "false",
 	"subTitle":                    "",
 	"subListen":                   "",
 	"subPort":                     "2096",
@@ -427,6 +428,10 @@ func (s *SettingService) GetSubEnable() (bool, error) {
 	return s.getBool("subEnable")
 }

+func (s *SettingService) GetSubJsonEnable() (bool, error) {
+	return s.getBool("subJsonEnable")
+}
+
 func (s *SettingService) GetSubTitle() (string, error) {
 	return s.getString("subTitle")
 }
@@ -575,6 +580,7 @@ func (s *SettingService) GetDefaultSettings(host string) (any, error) {
 		"defaultKey":    func() (any, error) { return s.GetKeyFile() },
 		"tgBotEnable":   func() (any, error) { return s.GetTgbotEnabled() },
 		"subEnable":     func() (any, error) { return s.GetSubEnable() },
+		"subJsonEnable": func() (any, error) { return s.GetSubJsonEnable() },
 		"subTitle":      func() (any, error) { return s.GetSubTitle() },
 		"subURI":        func() (any, error) { return s.GetSubURI() },
 		"subJsonURI":    func() (any, error) { return s.GetSubJsonURI() },
@@ -593,7 +599,14 @@ func (s *SettingService) GetDefaultSettings(host string) (any, error) {
 		result[key] = value
 	}

-	if result["subEnable"].(bool) && (result["subURI"].(string) == "" || result["subJsonURI"].(string) == "") {
+	subEnable := result["subEnable"].(bool)
+	subJsonEnable := false
+	if v, ok := result["subJsonEnable"]; ok {
+		if b, ok2 := v.(bool); ok2 {
+			subJsonEnable = b
+		}
+	}
+	if (subEnable && result["subURI"].(string) == "") || (subJsonEnable && result["subJsonURI"].(string) == "") {
 		subURI := ""
 		subTitle, _ := s.GetSubTitle()
 		subPort, _ := s.GetSubPort()
@@ -619,13 +632,13 @@ func (s *SettingService) GetDefaultSettings(host string) (any, error) {
 		} else {
 			subURI += fmt.Sprintf("%s:%d", subDomain, subPort)
 		}
-		if result["subURI"].(string) == "" {
+		if subEnable && result["subURI"].(string) == "" {
 			result["subURI"] = subURI + subPath
 		}
 		if result["subTitle"].(string) == "" {
 			result["subTitle"] = subTitle
 		}
-		if result["subJsonURI"].(string) == "" {
+		if subJsonEnable && result["subJsonURI"].(string) == "" {
 			result["subJsonURI"] = subURI + subJsonPath
 		}
 	}
@@ -18,14 +18,14 @@ import (
 	"strings"
 	"time"

-	"x-ui/config"
-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/web/global"
-	"x-ui/web/locale"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/web/global"
+	"github.com/mhsanaei/3x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/xray"

 	"github.com/google/uuid"
 	"github.com/mymmrac/telego"
@@ -1581,23 +1581,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 		)
 		prompt_message := t.I18nBot("tgbot.messages.comment_prompt", "ClientComment=="+client_Comment)
 		t.SendMsgToTgbot(chatId, prompt_message, cancel_btn_markup)
-	default:
-		// dynamic callbacks
-		if strings.HasPrefix(callbackQuery.Data, "client_sub_links ") {
-			email := strings.TrimPrefix(callbackQuery.Data, "client_sub_links ")
-			t.sendClientSubLinks(chatId, email)
-			return
-		}
-		if strings.HasPrefix(callbackQuery.Data, "client_individual_links ") {
-			email := strings.TrimPrefix(callbackQuery.Data, "client_individual_links ")
-			t.sendClientIndividualLinks(chatId, email)
-			return
-		}
-		if strings.HasPrefix(callbackQuery.Data, "client_qr_links ") {
-			email := strings.TrimPrefix(callbackQuery.Data, "client_qr_links ")
-			t.sendClientQRLinks(chatId, email)
-			return
-		}
 	case "add_client_ch_default_traffic":
 		inlineKeyboard := tu.InlineKeyboard(
 			tu.InlineKeyboardRow(
@@ -1813,6 +1796,22 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 			t.SendMsgToTgbot(chatId, msg, tu.ReplyKeyboardRemove())

 		}
+	default:
+		if after, ok := strings.CutPrefix(callbackQuery.Data, "client_sub_links "); ok {
+			email := after
+			t.sendClientSubLinks(chatId, email)
+			return
+		}
+		if after, ok := strings.CutPrefix(callbackQuery.Data, "client_individual_links "); ok {
+			email := after
+			t.sendClientIndividualLinks(chatId, email)
+			return
+		}
+		if after, ok := strings.CutPrefix(callbackQuery.Data, "client_qr_links "); ok {
+			email := after
+			t.sendClientQRLinks(chatId, email)
+			return
+		}
 	}
 }

@@ -2093,6 +2092,7 @@ func (t *Tgbot) buildSubscriptionURLs(email string) (string, string, error) {
 	subPort, _ := t.settingService.GetSubPort()
 	subPath, _ := t.settingService.GetSubPath()
 	subJsonPath, _ := t.settingService.GetSubJsonPath()
+	subJsonEnable, _ := t.settingService.GetSubJsonEnable()
 	subKeyFile, _ := t.settingService.GetSubKeyFile()
 	subCertFile, _ := t.settingService.GetSubCertFile()

@@ -2137,6 +2137,9 @@ func (t *Tgbot) buildSubscriptionURLs(email string) (string, string, error) {

 	subURL := fmt.Sprintf("%s://%s%s%s", scheme, host, subPath, client.SubID)
 	subJsonURL := fmt.Sprintf("%s://%s%s%s", scheme, host, subJsonPath, client.SubID)
+	if !subJsonEnable {
+		subJsonURL = ""
+	}
 	return subURL, subJsonURL, nil
 }

@@ -2146,8 +2149,10 @@ func (t *Tgbot) sendClientSubLinks(chatId int64, email string) {
 		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.errorOperation")+"\r\n"+err.Error())
 		return
 	}
-	msg := "Subscription URL:\r\n<code>" + subURL + "</code>\r\n\r\n" +
-		"JSON URL:\r\n<code>" + subJsonURL + "</code>"
+	msg := "Subscription URL:\r\n<code>" + subURL + "</code>"
+	if subJsonURL != "" {
+		msg += "\r\n\r\nJSON URL:\r\n<code>" + subJsonURL + "</code>"
+	}
 	inlineKeyboard := tu.InlineKeyboard(
 		tu.InlineKeyboardRow(
 			tu.InlineKeyboardButton(t.I18nBot("subscription.individualLinks")).WithCallbackData(t.encodeQuery("client_individual_links "+email)),
@@ -2271,15 +2276,17 @@ func (t *Tgbot) sendClientQRLinks(chatId int64, email string) {
 		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.errorOperation")+"\r\n"+err.Error())
 	}

-	// Send JSON URL QR (filename: subjson.png)
-	if png, err := createQR(subJsonURL, 320); err == nil {
-		document := tu.Document(
-			tu.ID(chatId),
-			tu.FileFromBytes(png, "subjson.png"),
-		)
-		_, _ = bot.SendDocument(context.Background(), document)
-	} else {
-		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.errorOperation")+"\r\n"+err.Error())
+	// Send JSON URL QR (filename: subjson.png) when available
+	if subJsonURL != "" {
+		if png, err := createQR(subJsonURL, 320); err == nil {
+			document := tu.Document(
+				tu.ID(chatId),
+				tu.FileFromBytes(png, "subjson.png"),
+			)
+			_, _ = bot.SendDocument(context.Background(), document)
+		} else {
+			t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.errorOperation")+"\r\n"+err.Error())
+		}
 	}

 	// Also generate a few individual links' QRs (first up to 5)
@@ -3,10 +3,10 @@ package service
 import (
 	"errors"

-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/database"
+	"github.com/mhsanaei/3x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/crypto"

 	"github.com/xlzd/gotp"
 	"gorm.io/gorm"
@@ -7,8 +7,9 @@ import (
 	"net/http"
 	"os"
 	"time"
-	"x-ui/logger"
-	"x-ui/util/common"
+
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
 )

 type WarpService struct {
@@ -6,8 +6,8 @@ import (
 	"runtime"
 	"sync"

-	"x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/xray"

 	"go.uber.org/atomic"
 )
@@ -4,8 +4,8 @@ import (
 	_ "embed"
 	"encoding/json"

-	"x-ui/util/common"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/xray"
 )

 type XraySettingService struct {
@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"net/http"

-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"

 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -371,6 +371,7 @@
 "subSettings" = "الاشتراك"
 "subEnable" = "تفعيل خدمة الاشتراك"
 "subEnableDesc" = "يفعل خدمة الاشتراك."
+"subJsonEnable" = "تمكين/تعطيل نقطة نهاية اشتراك JSON بشكل مستقل."
 "subTitle" = "عنوان الاشتراك"
 "subTitleDesc" = "العنوان اللي هيظهر في عميل VPN"
 "subListen" = "IP الاستماع"
@@ -369,8 +369,9 @@
 "timeZone" = "Time Zone"
 "timeZoneDesc" = "Scheduled tasks will run based on this time zone."
 "subSettings" = "Subscription"
-"subEnable" = "Enable Subscription Service"
-"subEnableDesc" = "Enables the subscription service."
+"subEnable" = "Subscription Service"
+"subEnableDesc" = "Enable/Disable the subscription service."
+"subJsonEnable" = "Enable/Disable the JSON subscription endpoint independently."
 "subTitle" = "Subscription Title"
 "subTitleDesc" = "Title shown in VPN client"
 "subListen" = "Listen IP"
@@ -371,6 +371,7 @@
 "subSettings" = "Suscripción"
 "subEnable" = "Habilitar Servicio"
 "subEnableDesc" = "Función de suscripción con configuración separada."
+"subJsonEnable" = "Habilitar/Deshabilitar el endpoint de suscripción JSON de forma independiente."
 "subTitle" = "Título de la Suscripción"
 "subTitleDesc" = "Título mostrado en el cliente de VPN"
 "subListen" = "Listening IP"
@@ -371,6 +371,7 @@
 "subSettings" = "سابسکریپشن"
 "subEnable" = "فعال‌سازی سرویس سابسکریپشن"
 "subEnableDesc" = "سرویس سابسکریپشن‌ را فعال‌می‌کند"
+"subJsonEnable" = "فعال/غیرفعال‌سازی مستقل نقطه دسترسی سابسکریپشن JSON."
 "subTitle" = "عنوان اشتراک"
 "subTitleDesc" = "عنوان نمایش داده شده در کلاینت VPN"
 "subListen" = "آدرس آی‌پی"
@@ -371,6 +371,7 @@
 "subSettings" = "Langganan"
 "subEnable" = "Aktifkan Layanan Langganan"
 "subEnableDesc" = "Mengaktifkan layanan langganan."
+"subJsonEnable" = "Aktifkan/Nonaktifkan endpoint langganan JSON secara mandiri."
 "subTitle" = "Judul Langganan"
 "subTitleDesc" = "Judul yang ditampilkan di klien VPN"
 "subListen" = "IP Pendengar"
@@ -371,6 +371,7 @@
 "subSettings" = "サブスクリプション設定"
 "subEnable" = "サブスクリプションサービスを有効にする"
 "subEnableDesc" = "サブスクリプションサービス機能を有効にする"
+"subJsonEnable" = "JSON サブスクリプションのエンドポイントを個別に有効/無効にする。"
 "subTitle" = "サブスクリプションタイトル"
 "subTitleDesc" = "VPNクライアントに表示されるタイトル"
 "subListen" = "監視IP"
@@ -371,6 +371,7 @@
 "subSettings" = "Assinatura"
 "subEnable" = "Ativar Serviço de Assinatura"
 "subEnableDesc" = "Ativa o serviço de assinatura."
+"subJsonEnable" = "Ativar/Desativar o endpoint de assinatura JSON de forma independente."
 "subTitle" = "Título da Assinatura"
 "subTitleDesc" = "Título exibido no cliente VPN"
 "subListen" = "IP de Escuta"
@@ -371,6 +371,7 @@
 "subSettings" = "Подписка"
 "subEnable" = "Включить подписку"
 "subEnableDesc" = "Функция подписки с отдельной конфигурацией"
+"subJsonEnable" = "Включить/отключить JSON-эндпоинт подписки независимо."
 "subTitle" = "Заголовок подписки"
 "subTitleDesc" = "Название подписки, которое видит клиент в VPN клиенте"
 "subListen" = "Прослушивание IP"
@@ -371,6 +371,7 @@
 "subSettings" = "Abonelik"
 "subEnable" = "Abonelik Hizmetini Etkinleştir"
 "subEnableDesc" = "Abonelik hizmetini etkinleştirir."
+"subJsonEnable" = "JSON abonelik uç noktasını bağımsız olarak Etkinleştir/Devre Dışı bırak."
 "subTitle" = "Abonelik Başlığı"
 "subTitleDesc" = "VPN istemcisinde gösterilen başlık"
 "subListen" = "Dinleme IP"
@@ -371,6 +371,7 @@
 "subSettings" = "Підписка"
 "subEnable" = "Увімкнути службу підписки"
 "subEnableDesc" = "Вмикає службу підписки."
+"subJsonEnable" = "Увімкнути/вимкнути JSON-кінець підписки незалежно."
 "subTitle" = "Назва Підписки"
 "subTitleDesc" = "Назва, яка відображається у VPN-клієнті"
 "subListen" = "Слухати IP"
@@ -371,6 +371,7 @@
 "subSettings" = "Gói đăng ký"
 "subEnable" = "Bật dịch vụ"
 "subEnableDesc" = "Tính năng gói đăng ký với cấu hình riêng"
+"subJsonEnable" = "Bật/Tắt điểm cuối đăng ký JSON độc lập."
 "subTitle" = "Tiêu đề Đăng ký"
 "subTitleDesc" = "Tiêu đề hiển thị trong ứng dụng VPN"
 "subListen" = "Listening IP"
@@ -371,6 +371,7 @@
 "subSettings" = "订阅设置"
 "subEnable" = "启用订阅服务"
 "subEnableDesc" = "启用订阅服务功能"
+"subJsonEnable" = "单独启用/禁用 JSON 订阅端点。"
 "subTitle" = "订阅标题"
 "subTitleDesc" = "在VPN客户端中显示的标题"
 "subListen" = "监听 IP"
@@ -371,6 +371,7 @@
 "subSettings" = "訂閱設定"
 "subEnable" = "啟用訂閱服務"
 "subEnableDesc" = "啟用訂閱服務功能"
+"subJsonEnable" = "獨立啟用/停用 JSON 訂閱端點。"
 "subTitle" = "訂閱標題"
 "subTitleDesc" = "在VPN客戶端中顯示的標題"
 "subListen" = "監聽 IP"
@@ -14,15 +14,15 @@ import (
 	"strings"
 	"time"

-	"x-ui/config"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/web/controller"
-	"x-ui/web/job"
-	"x-ui/web/locale"
-	"x-ui/web/middleware"
-	"x-ui/web/network"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/web/controller"
+	"github.com/mhsanaei/3x-ui/web/job"
+	"github.com/mhsanaei/3x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/middleware"
+	"github.com/mhsanaei/3x-ui/web/network"
+	"github.com/mhsanaei/3x-ui/web/service"

 	"github.com/gin-contrib/gzip"
 	"github.com/gin-contrib/sessions"
@@ -4,12 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"regexp"
 	"time"
-	"math"

-	"x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"

 	"github.com/xtls/xray-core/app/proxyman/command"
 	statsService "github.com/xtls/xray-core/app/stats/command"
@@ -3,7 +3,7 @@ package xray
 import (
 	"bytes"

-	"x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/json_util"
 )

 type Config struct {
@@ -3,7 +3,7 @@ package xray
 import (
 	"bytes"

-	"x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/json_util"
 )

 type InboundConfig struct {
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"

-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 )

 func NewLogWriter() *LogWriter {
@@ -13,9 +13,9 @@ import (
 	"syscall"
 	"time"

-	"x-ui/config"
-	"x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/config"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
 )

 func GetBinaryName() string {
Author	SHA1	Message	Date
mhsanaei	0ffd27c0aa	v2.8.2	2025-09-19 00:22:15 +02:00
mhsanaei	054cb1dea0	go package correction	2025-09-18 23:12:14 +02:00
Drahonn	3757ae0b11	cpu history timeframe (#3509 )	2025-09-18 20:52:31 +02:00
mhsanaei	e3883fca87	donate: nowpayments	2025-09-18 20:14:10 +02:00
mhsanaei	b46a0b404b	enhancements	2025-09-18 16:28:09 +02:00
mhsanaei	0ce58a095a	vscode: Debug for developer	2025-09-18 14:33:51 +02:00
mhsanaei	59ea2645db	new: subJsonEnable after this subEnable by default is true and subJsonEnable is false	2025-09-18 13:56:04 +02:00
mhsanaei	8c8d280f14	minor change	2025-09-18 12:20:21 +02:00
Harry NG	c720008187	chore: update sub page URL (#3505 ) * Fix: Shadowrocket link using base64 encoding * chore: update url	2025-09-18 12:11:52 +02:00
mhsanaei	170d24499e	fix PeriodicTrafficResetJob: log only when there are matching inbound	2025-09-18 11:41:11 +02:00
mhsanaei	99c79d4056	fix: online	2025-09-17 20:02:58 +02:00
RahGozar	fcdeb1fc79	feat: add UUID to ClientTraffic (#3491 ) * Update client_traffic.go * Update inbound.go	2025-09-17 17:45:28 +02:00
Harry NG	0a58b5e745	Fix: Shadowrocket link using base64 encoding (#3489 )	2025-09-17 17:43:09 +02:00
Tara Rostami	db7e7dcd29	css [fixes] (#3487 )	2025-09-17 15:47:04 +02:00
mhsanaei	01b8a27996	bug fix	2025-09-17 15:46:03 +02:00
@@ -1 +1 @@
 .8.1
 .8.2
				`@@ -0,0 +1 @@`
				<svg width="347" height="107" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 347.25 107"><defs><style>.cls-3,.cls-5{fill:none;stroke:#27282d;stroke-width:2.5px}.cls-3{stroke-linecap:round;stroke-miterlimit:10}</style></defs><path d="M184.25 29l9.44-18.57s9.9 18.29 9.46 18.57-9.42 6.63-9.42 6.63zm.08 6.64l9.41 6.59 9.42-6.59-9.42 15.72z" stroke-linecap="square" stroke-linejoin="round" fill="none" stroke="#27282d" stroke-width="2.5"/><path d="M17.17 0h313.25a16.75 16.75 0 0116.83 16.68v73.64A16.77 16.77 0 01330.33 107H17.17A16.9 16.9 0 01.25 90.24V16.68A16.77 16.77 0 0117.17 0z" fill="#13171c"/><path class="cls-3" d="M137.73 72.27h17.45c2 0 3.4 2.33 2.72 4.55l-3.49 11.58a3 3 0 01-2.73 2.26h-19.52m7.7-9.18h-10.87"/><path d="M96.44 38.72l-1.21-.3-.37 1.58h1.58zM112.25 40a1.25 1.25 0 000-2.5zm-10.17-30l-6.83 28.42 2.43.59 6.85-28.45zm-5.64 30h15.81v-2.5H96.44z" fill="#27282d"/><path class="cls-3" d="M106.25 24.24L92.63 29"/><path class="cls-5" d="M14.2 18.3h6.94v6.73H14.2zm-.55 68.24h6.94v6.73h-6.94zM192.68 2.27v52.58h-62.85V107M0 65.93h78.25v40.8m177.07 0V51.84h20.48m49.74 54.89V51.84h-21.56m-48.66 16.53h70.44M271.58 60h37.06m-4.77-40.58v15.51m-13.44-16.61v11.77m-11.49-13v10.1m2.44 32.06a8.29 8.29 0 01-.49-2.78 8.67 8.67 0 0117.34 0 8.29 8.29 0 01-.48 2.78"/><path class="cls-5" d="M275.8 59.63a14 14 0 01-.5-3.68 14.7 14.7 0 0129.39 0 14 14 0 01-.49 3.68M316.87 2v25.66H347"/><path d="M29.82 21.54l8.1-9.39 8.12 9.39m4.36 5.04L51.66 28m-14.3-1.42l1.3 1.42m-14.03-1.42l1.3 1.42m20.11 5.93l-8.12 9.4-8.1-9.4" stroke-miterlimit="10" fill="none" stroke="#27282d" stroke-width="2.5"/><path d="M39.25 58.39h4.42L53.32 73V58.39h4.72v22.44h-4.32l-9.65-14.55v14.55h-4.72V58.39zm34 23.02a14.73 14.73 0 01-4.72-.77 8.59 8.59 0 01-3.41-2.41 9.9 9.9 0 01-2.22-3.66 15.5 15.5 0 010-9.83 9.22 9.22 0 012.22-3.66 8.49 8.49 0 013.51-2.31 11.9 11.9 0 014.62-.77 14.75 14.75 0 014.73.77 11.21 11.21 0 013.52 2.31 11.58 11.58 0 012.21 3.66 15.08 15.08 0 01.7 4.92 15 15 0 01-.7 4.91 10.39 10.39 0 01-2.11 3.66 8 8 0 01-3.52 2.31 13 13 0 01-4.83.87zm0-4a5.49 5.49 0 004.63-2 9.59 9.59 0 001.5-5.78 9.26 9.26 0 00-1.5-5.68 5.37 5.37 0 00-4.63-2 5.47 5.47 0 00-4.62 2 9.44 9.44 0 00-1.51 5.68 9.59 9.59 0 001.51 5.78 5.34 5.34 0 004.62 1.95zm12.43-19.02h5.57L94.92 74l3.82-15.41h5.12l4 15.41 3.52-15.6h5.23l-6.36 22.43h-4.72l-4.28-16.57-4.22 16.57h-4.62z" fill="#68aaff"/><path d="M119.54 58.39h8a13.44 13.44 0 014.32.57 7.41 7.41 0 012.71 1.54 5.23 5.23 0 011.41 2.22 7.83 7.83 0 01.4 2.6 8.67 8.67 0 01-.4 2.8 5.58 5.58 0 01-1.41 2.31A7.41 7.41 0 01131.9 72a13.84 13.84 0 01-4.32.58h-4.22v8.38h-3.92V58.39zm8 10.88a9.51 9.51 0 002.51-.29 4.25 4.25 0 001.51-.77 3.34 3.34 0 00.8-1.25 8.18 8.18 0 00.2-1.64 7.5 7.5 0 00-.2-1.64 2.45 2.45 0 00-.8-1.15 3.62 3.62 0 00-1.51-.68 8.73 8.73 0 00-2.41-.29h-4.12v7.71zm21.64 9.35a7.1 7.1 0 01-2.31 1.83 7 7 0 01-3.32.77 7.67 7.67 0 01-2.2-.29 5 5 0 01-1.81-.87 3.77 3.77 0 01-1.21-1.54 5.18 5.18 0 01-.4-2.22 4.89 4.89 0 01.8-2.79 5.59 5.59 0 012-1.64 12.16 12.16 0 012.82-.87 16.55 16.55 0 013.12-.29l2.51-.1V70a3.2 3.2 0 00-.9-2.61 3.75 3.75 0 00-2.41-.67 4.71 4.71 0 00-2.62.58 2.7 2.7 0 00-1.1 1.64l-3.42-.39a4.94 4.94 0 012.21-3.55 9.81 9.81 0 014.93-1 10.64 10.64 0 013.31.48 4.65 4.65 0 012.07 1.32 4.89 4.89 0 011.11 2.12 11.21 11.21 0 01.3 2.7v10.21h-3.62v-2.21zm-2.51-5.5a17 17 0 00-2.71.39 5 5 0 00-1.61.67 1.8 1.8 0 00-.7.87 3.51 3.51 0 00-.2 1.16 2 2 0 00.7 1.64 3.42 3.42 0 002.11.57 5.06 5.06 0 003.62-1.15 4.29 4.29 0 001.2-3.28V73zm9.85 10.6a5.69 5.69 0 001.91.29 2.11 2.11 0 001.5-.48 3.47 3.47 0 001-1.74l.6-1.54-7.13-15.8h4.32l4.72 11.76 4.32-11.76h4l-6.73 16.48c-.4 1-.8 1.83-1.11 2.5a4.94 4.94 0 01-1.2 1.83 5.75 5.75 0 01-1.47 1.16 4.75 4.75 0 01-2.21.38 9.14 9.14 0 01-1.61-.09 8.29 8.29 0 01-1.5-.39zm21.3-19.27v2.32a6.42 6.42 0 014.22-2.7 5.37 5.37 0 011.31-.1 4.4 4.4 0 012.81.87 5 5 0 011.61 2.16 6.86 6.86 0 015.53-3 5.19 5.19 0 014 1.45 7.15 7.15 0 011.3 4.62v10.76h-3.72V71a11.61 11.61 0 00-.2-2 3.71 3.71 0 00-.5-1.25 2.6 2.6 0 00-.8-.67 3.66 3.66 0 00-1.11-.2 3.21 3.21 0 00-1.71.39 5.9 5.9 0 00-1.3.87 5.37 5.37 0 00-.81 1.25 3.72 3.72 0 00-.3 1.44v9.83h-3.7v-10c0-1.45-.2-2.41-.7-2.89a2.39 2.39 0 00-1.81-.77 8.41 8.41 0 00-1.2.19 3.35 3.35 0 00-1.31.68 4.85 4.85 0 00-1.11 1.25 3.67 3.67 0 00-.5 1.93v9.73h-3.72V64.45zm39.89 11.47a6.53 6.53 0 01-2.21 4 8 8 0 01-5.12 1.44 8.17 8.17 0 01-6.13-2.26 8.91 8.91 0 01-2.11-6.36 11 11 0 01.6-3.76 8.84 8.84 0 011.71-2.79 6.89 6.89 0 012.61-1.74 9.33 9.33 0 013.32-.57 9.5 9.5 0 013.42.57 7.25 7.25 0 012.45 1.64 6.9 6.9 0 011.4 2.51 10.44 10.44 0 01.51 3.27v1.54h-12.3a5.17 5.17 0 001.2 3.57 4.41 4.41 0 003.42 1.35 3.8 3.8 0 002.61-.68 3.22 3.22 0 001.21-1.92h3.41zM214.3 71a4.49 4.49 0 00-1-3.18 3.8 3.8 0 00-3.11-1.16 4 4 0 00-3.12 1.16 5.14 5.14 0 00-1.2 3.18zm10.95-6.55v2.41a8.93 8.93 0 012.51-2.21 6.61 6.61 0 013-.68c3.82 0 5.73 2 5.73 6.07v10.79h-3.72V70.52a4.13 4.13 0 00-.7-2.79 2.7 2.7 0 00-2.22-.77 5.94 5.94 0 00-1.8.29 3.31 3.31 0 00-1.41.87 3.36 3.36 0 00-.91 1.34 3.Line truncated