diff --git a/main.go b/main.go
index 4d2f05d5..37104b36 100644
--- a/main.go
+++ b/main.go
@@ -11,6 +11,7 @@ import (
"x-ui/config"
"x-ui/database"
"x-ui/logger"
+ "x-ui/sub"
"x-ui/v2ui"
"x-ui/web"
"x-ui/web/global"
@@ -50,6 +51,16 @@ func runWebServer() {
return
}
+ var subServer *sub.Server
+ subServer = sub.NewServer()
+ global.SetSubServer(subServer)
+
+ err = subServer.Start()
+ if err != nil {
+ log.Println(err)
+ return
+ }
+
sigCh := make(chan os.Signal, 1)
// Trap shutdown signals
signal.Notify(sigCh, syscall.SIGHUP, syscall.SIGTERM)
@@ -62,6 +73,11 @@ func runWebServer() {
if err != nil {
logger.Warning("stop server err:", err)
}
+ err = subServer.Stop()
+ if err != nil {
+ logger.Warning("stop server err:", err)
+ }
+
server = web.NewServer()
global.SetWebServer(server)
err = server.Start()
@@ -69,8 +85,18 @@ func runWebServer() {
log.Println(err)
return
}
+
+ subServer = sub.NewServer()
+ global.SetSubServer(subServer)
+
+ err = subServer.Start()
+ if err != nil {
+ log.Println(err)
+ return
+ }
default:
server.Stop()
+ subServer.Stop()
return
}
}
diff --git a/sub/sub.go b/sub/sub.go
new file mode 100644
index 00000000..be541ed2
--- /dev/null
+++ b/sub/sub.go
@@ -0,0 +1,171 @@
+package sub
+
+import (
+ "context"
+ "crypto/tls"
+ "io"
+ "net"
+ "net/http"
+ "strconv"
+ "strings"
+ "x-ui/config"
+ "x-ui/logger"
+ "x-ui/util/common"
+ "x-ui/web/network"
+ "x-ui/web/service"
+
+ "github.com/gin-gonic/gin"
+)
+
+type Server struct {
+ httpServer *http.Server
+ listener net.Listener
+
+ sub *SUBController
+ settingService service.SettingService
+
+ ctx context.Context
+ cancel context.CancelFunc
+}
+
+func NewServer() *Server {
+ ctx, cancel := context.WithCancel(context.Background())
+ return &Server{
+ ctx: ctx,
+ cancel: cancel,
+ }
+}
+
+func (s *Server) initRouter() (*gin.Engine, error) {
+ if config.IsDebug() {
+ gin.SetMode(gin.DebugMode)
+ } else {
+ gin.DefaultWriter = io.Discard
+ gin.DefaultErrorWriter = io.Discard
+ gin.SetMode(gin.ReleaseMode)
+ }
+
+ engine := gin.Default()
+
+ subPath, err := s.settingService.GetSubPath()
+ if err != nil {
+ return nil, err
+ }
+
+ subDomain, err := s.settingService.GetSubDomain()
+ if err != nil {
+ return nil, err
+ }
+
+ if subDomain != "" {
+ validateDomain := func(c *gin.Context) {
+ host := strings.Split(c.Request.Host, ":")[0]
+
+ if host != subDomain {
+ c.AbortWithStatus(http.StatusForbidden)
+ return
+ }
+
+ c.Next()
+ }
+
+ engine.Use(validateDomain)
+ }
+
+ g := engine.Group(subPath)
+
+ s.sub = NewSUBController(g)
+
+ return engine, nil
+}
+
+func (s *Server) Start() (err error) {
+ //This is an anonymous function, no function name
+ defer func() {
+ if err != nil {
+ s.Stop()
+ }
+ }()
+
+ subEnable, err := s.settingService.GetSubEnable()
+ if err != nil {
+ return err
+ }
+ if !subEnable {
+ return nil
+ }
+
+ engine, err := s.initRouter()
+ if err != nil {
+ return err
+ }
+
+ certFile, err := s.settingService.GetSubCertFile()
+ if err != nil {
+ return err
+ }
+ keyFile, err := s.settingService.GetSubKeyFile()
+ if err != nil {
+ return err
+ }
+ listen, err := s.settingService.GetSubListen()
+ if err != nil {
+ return err
+ }
+ port, err := s.settingService.GetSubPort()
+ if err != nil {
+ return err
+ }
+ listenAddr := net.JoinHostPort(listen, strconv.Itoa(port))
+ listener, err := net.Listen("tcp", listenAddr)
+ if err != nil {
+ return err
+ }
+ if certFile != "" || keyFile != "" {
+ cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+ if err != nil {
+ listener.Close()
+ return err
+ }
+ c := &tls.Config{
+ Certificates: []tls.Certificate{cert},
+ }
+ listener = network.NewAutoHttpsListener(listener)
+ listener = tls.NewListener(listener, c)
+ }
+
+ if certFile != "" || keyFile != "" {
+ logger.Info("Sub server run https on", listener.Addr())
+ } else {
+ logger.Info("Sub server run http on", listener.Addr())
+ }
+ s.listener = listener
+
+ s.httpServer = &http.Server{
+ Handler: engine,
+ }
+
+ go func() {
+ s.httpServer.Serve(listener)
+ }()
+
+ return nil
+}
+
+func (s *Server) Stop() error {
+ s.cancel()
+
+ var err1 error
+ var err2 error
+ if s.httpServer != nil {
+ err1 = s.httpServer.Shutdown(s.ctx)
+ }
+ if s.listener != nil {
+ err2 = s.listener.Close()
+ }
+ return common.Combine(err1, err2)
+}
+
+func (s *Server) GetCtx() context.Context {
+ return s.ctx
+}
diff --git a/web/controller/sub.go b/sub/subController.go
similarity index 89%
rename from web/controller/sub.go
rename to sub/subController.go
index 2b218c21..69d9086d 100644
--- a/web/controller/sub.go
+++ b/sub/subController.go
@@ -1,17 +1,14 @@
-package controller
+package sub
import (
"encoding/base64"
"strings"
- "x-ui/web/service"
"github.com/gin-gonic/gin"
)
type SUBController struct {
- BaseController
-
- subService service.SubService
+ subService SubService
}
func NewSUBController(g *gin.RouterGroup) *SUBController {
@@ -21,7 +18,7 @@ func NewSUBController(g *gin.RouterGroup) *SUBController {
}
func (a *SUBController) initRouter(g *gin.RouterGroup) {
- g = g.Group("/sub")
+ g = g.Group("/")
g.GET("/:subid", a.subs)
}
diff --git a/web/service/sub.go b/sub/subService.go
similarity index 90%
rename from web/service/sub.go
rename to sub/subService.go
index a5a80004..32c57c81 100644
--- a/web/service/sub.go
+++ b/sub/subService.go
@@ -1,4 +1,4 @@
-package service
+package sub
import (
"encoding/base64"
@@ -8,6 +8,7 @@ import (
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"
+ "x-ui/web/service"
"x-ui/xray"
"github.com/goccy/go-json"
@@ -15,7 +16,8 @@ import (
type SubService struct {
address string
- inboundService InboundService
+ inboundService service.InboundService
+ settingServics service.SettingService
}
func (s *SubService) GetSubs(subId string, host string) ([]string, []string, error) {
@@ -29,7 +31,7 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, []string, err
return nil, nil, err
}
for _, inbound := range inbounds {
- clients, err := s.inboundService.getClients(inbound)
+ clients, err := s.inboundService.GetClients(inbound)
if err != nil {
logger.Error("SubService - GetSub: Unable to get clients from inbound")
}
@@ -66,7 +68,8 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, []string, err
}
}
headers = append(headers, fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000))
- headers = append(headers, "12")
+ updateInterval, _ := s.settingServics.GetSubUpdates()
+ headers = append(headers, fmt.Sprintf("%d", updateInterval))
headers = append(headers, subId)
return result, headers, nil
}
@@ -163,6 +166,7 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
}
security, _ := stream["security"].(string)
+ var domains []interface{}
obj["tls"] = security
if security == "tls" {
tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
@@ -185,6 +189,9 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok {
obj["allowInsecure"], _ = insecure.(bool)
}
+ if domainSettings, ok := searchKey(tlsSettings, "domains"); ok {
+ domains, _ = domainSettings.([]interface{})
+ }
}
serverName, _ := tlsSetting["serverName"].(string)
if serverName != "" {
@@ -192,7 +199,7 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
}
}
- clients, _ := s.inboundService.getClients(inbound)
+ clients, _ := s.inboundService.GetClients(inbound)
clientIndex := -1
for i, client := range clients {
if client.Email == email {
@@ -203,6 +210,21 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
obj["id"] = clients[clientIndex].ID
obj["aid"] = clients[clientIndex].AlterIds
+ if len(domains) > 0 {
+ links := ""
+ for index, d := range domains {
+ domain := d.(map[string]interface{})
+ obj["ps"] = remark + "-" + domain["remark"].(string)
+ obj["add"] = domain["domain"].(string)
+ if index > 0 {
+ links += "\n"
+ }
+ jsonStr, _ := json.MarshalIndent(obj, "", " ")
+ links += "vmess://" + base64.StdEncoding.EncodeToString(jsonStr)
+ }
+ return links
+ }
+
jsonStr, _ := json.MarshalIndent(obj, "", " ")
return "vmess://" + base64.StdEncoding.EncodeToString(jsonStr)
}
@@ -214,7 +236,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
}
var stream map[string]interface{}
json.Unmarshal([]byte(inbound.StreamSettings), &stream)
- clients, _ := s.inboundService.getClients(inbound)
+ clients, _ := s.inboundService.GetClients(inbound)
clientIndex := -1
for i, client := range clients {
if client.Email == email {
@@ -270,6 +292,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
}
security, _ := stream["security"].(string)
+ var domains []interface{}
if security == "tls" {
params["security"] = "tls"
tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
@@ -294,6 +317,9 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
params["allowInsecure"] = "1"
}
}
+ if domainSettings, ok := searchKey(tlsSettings, "domains"); ok {
+ domains, _ = domainSettings.([]interface{})
+ }
}
if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
@@ -354,8 +380,22 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
// Set the new query values on the URL
url.RawQuery = q.Encode()
-
remark := fmt.Sprintf("%s-%s", inbound.Remark, email)
+
+ if len(domains) > 0 {
+ links := ""
+ for index, d := range domains {
+ domain := d.(map[string]interface{})
+ url.Fragment = remark + "-" + domain["remark"].(string)
+ url.Host = domain["domain"].(string)
+ if index > 0 {
+ links += "\n"
+ }
+ links += url.String()
+ }
+ return links
+ }
+
url.Fragment = remark
return url.String()
}
@@ -367,7 +407,7 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
}
var stream map[string]interface{}
json.Unmarshal([]byte(inbound.StreamSettings), &stream)
- clients, _ := s.inboundService.getClients(inbound)
+ clients, _ := s.inboundService.GetClients(inbound)
clientIndex := -1
for i, client := range clients {
if client.Email == email {
@@ -423,6 +463,7 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
}
security, _ := stream["security"].(string)
+ var domains []interface{}
if security == "tls" {
params["security"] = "tls"
tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
@@ -447,6 +488,9 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
params["allowInsecure"] = "1"
}
}
+ if domainSettings, ok := searchKey(tlsSettings, "domains"); ok {
+ domains, _ = domainSettings.([]interface{})
+ }
}
serverName, _ := tlsSetting["serverName"].(string)
@@ -506,6 +550,21 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
url.RawQuery = q.Encode()
remark := fmt.Sprintf("%s-%s", inbound.Remark, email)
+
+ if len(domains) > 0 {
+ links := ""
+ for index, d := range domains {
+ domain := d.(map[string]interface{})
+ url.Fragment = remark + "-" + domain["remark"].(string)
+ url.Host = fmt.Sprintf("%s:%d", domain["domain"].(string), port)
+ if index > 0 {
+ links += "\n"
+ }
+ links += url.String()
+ }
+ return links
+ }
+
url.Fragment = remark
return url.String()
}
@@ -517,7 +576,7 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
}
var stream map[string]interface{}
json.Unmarshal([]byte(inbound.StreamSettings), &stream)
- clients, _ := s.inboundService.getClients(inbound)
+ clients, _ := s.inboundService.GetClients(inbound)
var settings map[string]interface{}
json.Unmarshal([]byte(inbound.Settings), &settings)
diff --git a/web/assets/js/model/models.js b/web/assets/js/model/models.js
index 03064a59..d7fc7981 100644
--- a/web/assets/js/model/models.js
+++ b/web/assets/js/model/models.js
@@ -180,6 +180,14 @@ class AllSetting {
this.tgBotBackup = false;
this.tgCpu = "";
this.xrayTemplateConfig = "";
+ this.subEnable = false;
+ this.subListen = "";
+ this.subPort = "2096";
+ this.subPath = "sub/";
+ this.subDomain = "";
+ this.subCertFile = "";
+ this.subKeyFile = "";
+ this.subUpdates = 0;
this.timeLocation = "Asia/Tehran";
diff --git a/web/controller/setting.go b/web/controller/setting.go
index 623a34ce..305c5222 100644
--- a/web/controller/setting.go
+++ b/web/controller/setting.go
@@ -70,11 +70,56 @@ func (a *SettingController) getDefaultSettings(c *gin.Context) {
jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
return
}
+ tgBotEnable, err := a.settingService.GetTgbotenabled()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subEnable, err := a.settingService.GetSubEnable()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subPort, err := a.settingService.GetSubPort()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subPath, err := a.settingService.GetSubPath()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subDomain, err := a.settingService.GetSubDomain()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subKeyFile, err := a.settingService.GetSubKeyFile()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subCertFile, err := a.settingService.GetSubCertFile()
+ if err != nil {
+ jsonMsg(c, I18n(c, "pages.settings.toasts.getSettings"), err)
+ return
+ }
+ subTLS := false
+ if subKeyFile != "" || subCertFile != "" {
+ subTLS = true
+ }
result := map[string]interface{}{
"expireDiff": expireDiff,
"trafficDiff": trafficDiff,
"defaultCert": defaultCert,
"defaultKey": defaultKey,
+ "tgBotEnable": tgBotEnable,
+ "subEnable": subEnable,
+ "subPort": subPort,
+ "subPath": subPath,
+ "subDomain": subDomain,
+ "subTLS": subTLS,
}
jsonObj(c, result, nil)
}
diff --git a/web/entity/entity.go b/web/entity/entity.go
index 0186a8c6..cfdd3b6b 100644
--- a/web/entity/entity.go
+++ b/web/entity/entity.go
@@ -43,6 +43,14 @@ type AllSetting struct {
TgCpu int `json:"tgCpu" form:"tgCpu"`
XrayTemplateConfig string `json:"xrayTemplateConfig" form:"xrayTemplateConfig"`
TimeLocation string `json:"timeLocation" form:"timeLocation"`
+ SubEnable bool `json:"subEnable" form:"subEnable"`
+ SubListen string `json:"subListen" form:"subListen"`
+ SubPort int `json:"subPort" form:"subPort"`
+ SubPath string `json:"subPath" form:"subPath"`
+ SubDomain string `json:"subDomain" form:"subDomain"`
+ SubCertFile string `json:"subCertFile" form:"subCertFile"`
+ SubKeyFile string `json:"subKeyFile" form:"subKeyFile"`
+ SubUpdates int `json:"subUpdates" form:"subUpdates"`
}
func (s *AllSetting) CheckValid() error {
@@ -53,10 +61,25 @@ func (s *AllSetting) CheckValid() error {
}
}
+ if s.SubListen != "" {
+ ip := net.ParseIP(s.SubListen)
+ if ip == nil {
+ return common.NewError("Sub listen is not valid ip:", s.SubListen)
+ }
+ }
+
if s.WebPort <= 0 || s.WebPort > 65535 {
return common.NewError("web port is not a valid port:", s.WebPort)
}
+ if s.SubPort <= 0 || s.SubPort > 65535 {
+ return common.NewError("Sub port is not a valid port:", s.SubPort)
+ }
+
+ if s.SubPort == s.WebPort {
+ return common.NewError("Sub and Web could not use same port:", s.SubPort)
+ }
+
if s.WebCertFile != "" || s.WebKeyFile != "" {
_, err := tls.LoadX509KeyPair(s.WebCertFile, s.WebKeyFile)
if err != nil {
@@ -64,6 +87,13 @@ func (s *AllSetting) CheckValid() error {
}
}
+ if s.SubCertFile != "" || s.SubKeyFile != "" {
+ _, err := tls.LoadX509KeyPair(s.SubCertFile, s.SubKeyFile)
+ if err != nil {
+ return common.NewErrorf("cert file <%v> or key file <%v> invalid: %v", s.SubCertFile, s.SubKeyFile, err)
+ }
+ }
+
if !strings.HasPrefix(s.WebBasePath, "/") {
s.WebBasePath = "/" + s.WebBasePath
}
diff --git a/web/global/global.go b/web/global/global.go
index 09d0683a..7d0b4e1f 100644
--- a/web/global/global.go
+++ b/web/global/global.go
@@ -2,17 +2,23 @@ package global
import (
"context"
- "github.com/robfig/cron/v3"
_ "unsafe"
+
+ "github.com/robfig/cron/v3"
)
var webServer WebServer
+var subServer SubServer
type WebServer interface {
GetCron() *cron.Cron
GetCtx() context.Context
}
+type SubServer interface {
+ GetCtx() context.Context
+}
+
func SetWebServer(s WebServer) {
webServer = s
}
@@ -20,3 +26,11 @@ func SetWebServer(s WebServer) {
func GetWebServer() WebServer {
return webServer
}
+
+func SetSubServer(s SubServer) {
+ subServer = s
+}
+
+func GetSubServer() SubServer {
+ return subServer
+}
diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/client_bulk_modal.html
index ff636e71..37e8045d 100644
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -71,7 +71,7 @@
-
+
| Subscription |
@@ -79,7 +79,7 @@
|
-
+
| Telegram Username |
@@ -215,6 +215,7 @@
case Protocols.VMESS: return clientSettings.vmesses;
case Protocols.VLESS: return clientSettings.vlesses;
case Protocols.TROJAN: return clientSettings.trojans;
+ case Protocols.SHADOWSOCKS: return clientSettings.shadowsockses;
default: return null;
}
},
@@ -223,6 +224,7 @@
case Protocols.VMESS: return new Inbound.VmessSettings.Vmess();
case Protocols.VLESS: return new Inbound.VLESSSettings.VLESS();
case Protocols.TROJAN: return new Inbound.TrojanSettings.Trojan();
+ case Protocols.SHADOWSOCKS: return new Inbound.ShadowsocksSettings.Shadowsocks();
default: return null;
}
},
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index 4db3c425..db2a6a73 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -54,7 +54,7 @@
|
-
+
| Subscription |
@@ -62,7 +62,7 @@
|
-
+
| Telegram Username |
diff --git a/web/html/xui/form/protocol/shadowsocks.html b/web/html/xui/form/protocol/shadowsocks.html
index 70a8705e..e6288642 100644
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -29,18 +29,18 @@
|
-
+
| Subscription |
-
+
|
-
+
| Telegram Username |
-
+
|
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index a6787deb..4c351b26 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -27,18 +27,18 @@
-
+
| Subscription |
-
+
|
-
+
| Telegram Username |
-
+
|
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index db381004..02420b6a 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -38,18 +38,18 @@
-
+
| Subscription |
-
+
|
-
+
| Telegram Username |
-
+
|
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index 3e8e4875..d20b2f47 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -35,18 +35,18 @@
-
+
| Subscription |
-
+
|
-
+
| Telegram Username |
-
+
|
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index 7628f1dc..22064b34 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -102,19 +102,16 @@
-
+
+ Subscription link
+ [[ infoModal.subLink ]]
+
+
+
+ Telegram Username
+ @[[ infoModal.clientSettings.tgId ]]
+
+
@@ -198,6 +195,8 @@
link: null,
index: null,
isExpired: false,
+ subLink: '',
+ tgLink: '',
show(dbInbound, index) {
this.index = index;
this.inbound = dbInbound.toInbound();
@@ -207,11 +206,27 @@
this.clientSettings = this.settings.clients ? Object.values(this.settings.clients)[index] : null;
this.isExpired = this.inbound.isExpiry(index);
this.clientStats = this.settings.clients ? this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) : [];
+ if (this.clientSettings) {
+ if (this.clientSettings.subId) {
+ this.subLink = this.genSubLink(this.clientSettings.subId);
+ }
+ if (this.clientSettings.tgId) {
+ this.tgLink = "https://t.me/" + this.clientSettings.tgId;
+ }
+ }
this.visible = true;
},
close() {
infoModal.visible = false;
},
+ genSubLink(subID) {
+ protocol = app.subSettings.tls ? "https://" : "http://";
+ hostName = app.subSettings.domain === "" ? window.location.hostname : app.subSettings.domain;
+ subPort = app.subSettings.port;
+ port = (subPort === 443 && app.subSettings.tls) || (subPort === 80 && !app.subSettings.tls) ? "" : ":" + String(subPort);
+ subPath = app.subSettings.path;
+ return protocol + hostName + port + subPath + subID;
+ }
};
const infoModalApp = new Vue({
@@ -237,12 +252,6 @@
}
return infoModal.dbInbound.isEnable;
},
- get subBase() {
- return window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port:"") + basePath + "sub/";
- },
- get tgBase() {
- return "https://t.me/"
- },
},
methods: {
copyToClipboard(elmentId,content) {
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 50c23a18..9dfc1f02 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -339,7 +339,15 @@
clientCount: {},
isRefreshEnabled: localStorage.getItem("isRefreshEnabled") === "true" ? true : false,
refreshing: false,
- refreshInterval: Number(localStorage.getItem("refreshInterval")) || 5000
+ refreshInterval: Number(localStorage.getItem("refreshInterval")) || 5000,
+ subSettings: {
+ enable : false,
+ port: 0,
+ path: '',
+ domain: '',
+ tls: false
+ },
+ tgBotEnable: false
},
methods: {
loading(spinning = true) {
@@ -361,10 +369,20 @@
if (!msg.success) {
return;
}
- this.expireDiff = msg.obj.expireDiff * 86400000;
- this.trafficDiff = msg.obj.trafficDiff * 1073741824;
- this.defaultCert = msg.obj.defaultCert;
- this.defaultKey = msg.obj.defaultKey;
+ with(msg.obj){
+ this.expireDiff = expireDiff * 86400000;
+ this.trafficDiff = trafficDiff * 1073741824;
+ this.defaultCert = defaultCert;
+ this.defaultKey = defaultKey;
+ this.tgBotEnable = tgBotEnable;
+ this.subSettings = {
+ enable : subEnable,
+ port: subPort,
+ path: subPath,
+ domain: subDomain,
+ tls: subTLS
+ };
+ }
},
setInbounds(dbInbounds) {
this.inbounds.splice(0);
diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html
index 8baabe5c..7f79a326 100644
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -255,6 +255,24 @@
+
+
+
+
+ {{ i18n "pages.settings.infoDesc" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 119e497e..3c39a230 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -51,7 +51,7 @@ func (s *InboundService) checkPortExist(port int, ignoreId int) (bool, error) {
return count > 0, nil
}
-func (s *InboundService) getClients(inbound *model.Inbound) ([]model.Client, error) {
+func (s *InboundService) GetClients(inbound *model.Inbound) ([]model.Client, error) {
settings := map[string][]model.Client{}
json.Unmarshal([]byte(inbound.Settings), &settings)
if settings == nil {
@@ -110,7 +110,7 @@ func (s *InboundService) checkEmailsExistForClients(clients []model.Client) (str
}
func (s *InboundService) checkEmailExistForInbound(inbound *model.Inbound) (string, error) {
- clients, err := s.getClients(inbound)
+ clients, err := s.GetClients(inbound)
if err != nil {
return "", err
}
@@ -150,7 +150,7 @@ func (s *InboundService) AddInbound(inbound *model.Inbound) (*model.Inbound, err
return inbound, common.NewError("Duplicate email:", existEmail)
}
- clients, err := s.getClients(inbound)
+ clients, err := s.GetClients(inbound)
if err != nil {
return inbound, err
}
@@ -249,7 +249,7 @@ func (s *InboundService) UpdateInbound(inbound *model.Inbound) (*model.Inbound,
}
func (s *InboundService) AddInboundClient(data *model.Inbound) error {
- clients, err := s.getClients(data)
+ clients, err := s.GetClients(data)
if err != nil {
return err
}
@@ -352,7 +352,7 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) error
}
func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId string) error {
- clients, err := s.getClients(data)
+ clients, err := s.GetClients(data)
if err != nil {
return err
}
@@ -370,7 +370,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
return err
}
- oldClients, err := s.getClients(oldInbound)
+ oldClients, err := s.GetClients(oldInbound)
if err != nil {
return err
}
@@ -774,7 +774,7 @@ func (s *InboundService) GetClientTrafficTgBot(tguname string) ([]*xray.ClientTr
}
var emails []string
for _, inbound := range inbounds {
- clients, err := s.getClients(inbound)
+ clients, err := s.GetClients(inbound)
if err != nil {
logger.Error("Unable to get clients from inbound")
}
@@ -902,7 +902,7 @@ func (s *InboundService) MigrationRequirements() {
}
// Add client traffic row for all clients which has email
- modelClients, err := s.getClients(inbounds[inbound_index])
+ modelClients, err := s.GetClients(inbounds[inbound_index])
if err != nil {
return
}
diff --git a/web/service/setting.go b/web/service/setting.go
index 3ceb7a59..638d9107 100644
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -39,6 +39,14 @@ var defaultValueMap = map[string]string{
"tgRunTime": "@daily",
"tgBotBackup": "false",
"tgCpu": "0",
+ "subEnable": "false",
+ "subListen": "",
+ "subPort": "2096",
+ "subPath": "sub/",
+ "subDomain": "",
+ "subCertFile": "",
+ "subKeyFile": "",
+ "subUpdates": "12",
}
type SettingService struct {
@@ -307,6 +315,48 @@ func (s *SettingService) GetTimeLocation() (*time.Location, error) {
return location, nil
}
+func (s *SettingService) GetSubEnable() (bool, error) {
+ return s.getBool("subEnable")
+}
+
+func (s *SettingService) GetSubListen() (string, error) {
+ return s.getString("subListen")
+}
+
+func (s *SettingService) GetSubPort() (int, error) {
+ return s.getInt("subPort")
+}
+
+func (s *SettingService) GetSubPath() (string, error) {
+ subPath, err := s.getString("subPath")
+ if err != nil {
+ return "", err
+ }
+ if !strings.HasPrefix(subPath, "/") {
+ subPath = "/" + subPath
+ }
+ if !strings.HasSuffix(subPath, "/") {
+ subPath += "/"
+ }
+ return subPath, nil
+}
+
+func (s *SettingService) GetSubDomain() (string, error) {
+ return s.getString("subDomain")
+}
+
+func (s *SettingService) GetSubCertFile() (string, error) {
+ return s.getString("subCertFile")
+}
+
+func (s *SettingService) GetSubKeyFile() (string, error) {
+ return s.getString("subKeyFile")
+}
+
+func (s *SettingService) GetSubUpdates() (int, error) {
+ return s.getInt("subUpdates")
+}
+
func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
if err := allSetting.CheckValid(); err != nil {
return err
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index e93f07e9..073cf0ab 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -244,6 +244,24 @@
"tgNotifyCpuDesc" = "Receive notification if CPU usage exceeds this threshold (unit: %)"
"timeZone" = "Time Zone"
"timeZoneDesc" = "Scheduled tasks run according to the time in this time zone."
+"subSettings" = "Subscription"
+"subEnable" = "Enable service"
+"subEnableDesc" = "Subscription feature with separate configuration"
+"subListen" = "Listening IP"
+"subListenDesc" = "Leave blank by default to monitor all IPs"
+"subPort" = "Subscription Port"
+"subPortDesc" = "Port number for serving the subscription service must be unused in server"
+"subCertPath" = "Subscription Certificate Public Key File Path"
+"subCertPathDesc" = "Fill in an absolute path starting with '/'"
+"subKeyPath" = "Subscription Certificate Private Key File Path"
+"subKeyPathDesc" = "Fill in an absolute path starting with '/'"
+"subPath" = "Subscription URL Root Path"
+"subPathDesc" = "Must start with '/' and end with '/'"
+"subDomain" = "Listening Domain"
+"subDomainDesc" = "Leave blank by default to monitor all domains and IPs"
+"subUpdates" = "Subscription update intervals"
+"subUpdatesDesc" = "Interval hours between updates in client application"
+
[pages.settings.templates]
"title" = "Templates"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 90f22d89..3249b564 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -243,6 +243,23 @@
"tgNotifyCpuDesc" = "این ربات تلگرام در صورت استفاده پردازنده بیشتر از این درصد برای شما پیام ارسال می کند.(واحد: درصد)"
"timeZone" = "منظقه زمانی"
"timeZoneDesc" = "وظایف برنامه ریزی شده بر اساس این منطقه زمانی اجرا می شوند. پنل را مجدداً راه اندازی می کند تا اعمال شود"
+"subSettings" = "سابسکریپشن"
+"subEnable" = "فعال کردن سرویس"
+"subEnableDesc" = "ویژگی سابسکریپشن با پیکربندی جداگانه"
+"subListen" = "محدودیت آیپی"
+"subListenDesc" = "برای استفاده از همه آیپی ها به طور پیش فرض خالی بگذارید"
+"subPort" = "پورت سرویس"
+"subPortDesc" = "شماره پورت برای ارائه خدمات سابسکریپشن باید خالی باشد"
+"subCertPath" = "مسیر فایل کلید عمومی گواهی سابسکریپشن"
+"subCertPathDesc" = "یک مسیر مطلق که با '/' شروع می شود را پر کنید."
+"subKeyPath" = "مسیر فایل کلید خصوصی گواهی سابسکریپشن"
+"subKeyPathDesc" = "یک مسیر مطلق که با '/' شروع می شود را پر کنید."
+"subPath" = "مسیر ریشه سابسکریپشن"
+"subPathDesc" = "باید با '/' شروع شود و با '/' ختم شود."
+"subDomain" = "دامنه مخصوص سابسکریپشن"
+"subDomainDesc" = "برای نظارت بر همه دامنه ها و آیپی ها به طور پیش فرض خالی بگذارید"
+"subUpdates" = "فاصله به روز رسانی های سابسکریپشن"
+"subUpdatesDesc" = "ساعت های فاصله بین به روز رسانی در برنامه کاربر"
[pages.settings.templates]
"title" = "الگوها"
diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index 16019ca6..1b7a8f07 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -244,6 +244,23 @@
"tgNotifyCpuDesc" = "Получение уведомления, если нагрузка на ЦП превышает этот порог (значение:%)"
"timeZone" = "Временная зона"
"timeZoneDesc" = "Запланированные задачи выполняются в соответствии со временем в этом часовом поясе. Перезагрузите панель для применения настроек"
+"subSettings" = "Подписка"
+"subEnable" = "Включить службу"
+"subEnableDesc" = "Функция подписки с отдельной конфигурацией"
+"subListen" = "Прослушивание IP"
+"subListenDesc" = "Оставьте пустым по умолчанию, чтобы отслеживать все IP-адреса"
+"subPort" = "Порт подписки"
+"subPortDesc" = "Номер порта для обслуживания службы подписки не должен использоваться на сервере"
+"subCertPath" = "Путь к файлу открытого ключа сертификата подписки"
+"subCertPathDesc" = "Введите абсолютный путь, начинающийся с '/'"
+"subKeyPath" = "Путь к файлу закрытого ключа сертификата подписки"
+"subKeyPathDesc" = "Введите абсолютный путь, начинающийся с '/'"
+"subPath" = "Корневой путь URL-адреса подписки"
+"subPathDesc" = "Должен начинаться с '/' и заканчиваться на '/'"
+"subDomain" = "Домен прослушивания"
+"subDomainDesc" = "Оставьте пустым по умолчанию, чтобы отслеживать все домены и IP-адреса"
+"subUpdates" = "Интервалы обновления подписки"
+"subUpdatesDesc" = "Часовой интервал между обновлениями в клиентском приложении"
[pages.settings.templates]
"title" = "Шаблоны"
diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml
index cd66d65a..50654959 100644
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -244,6 +244,23 @@
"tgNotifyCpuDesc" = "如果 CPU 使用率超过此百分比（单位：%），此 talegram bot 将向您发送通知"
"timeZone" = "时区"
"timeZoneDesc" = "定时任务按照该时区的时间运行"
+"subSettings" = "订阅"
+"subEnable" = "启用服务"
+"subEnableDesc" = "具有单独配置的订阅功能"
+"subListen" = "监听IP"
+"subListenDesc" = "留空默认监听所有IP"
+"subPort" = "订阅端口"
+"subPortDesc" = "服务订阅服务的端口号必须在服务器中未使用"
+"subCertPath" = "订阅证书公钥文件路径"
+"subCertPathDesc" = "填写以'/'开头的绝对路径"
+"subKeyPath" = "订阅证书私钥文件路径"
+"subKeyPathDesc" = "填写以'/'开头的绝对路径"
+"subPath" = "订阅 URL 根路径"
+"subPathDesc" = "必须以'/'开始并以'/'结束"
+"subDomain" = "监听域"
+"subDomainDesc" = "留空默认监控所有域名和IP"
+"subUpdates" = "订阅更新间隔"
+"subUpdatesDesc" = "客户端应用程序更新之间的间隔时间"
[pages.settings.templates]
"title" = "模板"
diff --git a/web/web.go b/web/web.go
index 4745ee2d..7d6cd926 100644
--- a/web/web.go
+++ b/web/web.go
@@ -85,7 +85,6 @@ type Server struct {
server *controller.ServerController
xui *controller.XUIController
api *controller.APIController
- sub *controller.SUBController
xrayService service.XrayService
settingService service.SettingService
@@ -209,7 +208,6 @@ func (s *Server) initRouter() (*gin.Engine, error) {
s.server = controller.NewServerController(g)
s.xui = controller.NewXUIController(g)
s.api = controller.NewAPIController(g)
- s.sub = controller.NewSUBController(g)
return engine, nil
}