Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-12 21:20:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: sub services

Browse source
This commit is contained in:
Ilya05228 2025-08-28 20:07:59 +03:00
parent ccbd5c6a0d
commit f77d8b7bb5
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sub/subJsonService.go
View file

@ -67,6 +67,7 @@ func NewSubJsonService(fragment string, noises string, mux string, rules string,
} }
} }
// TODO: ошибка ч массивм какая то
func (s *SubJsonService) GetJson(subId string, host string) (string, string, error) { func (s *SubJsonService) GetJson(subId string, host string) (string, string, error) {
inbounds, err := s.SubService.getInboundsBySubId(subId) inbounds, err := s.SubService.getInboundsBySubId(subId)
if err != nil || len(inbounds) == 0 { if err != nil || len(inbounds) == 0 {
@ -87,24 +88,28 @@ func (s *SubJsonService) GetJson(subId string, host string) (string, string, err
if clients == nil { if clients == nil {
continue continue
} }
if len(inbound.Listen) > 0 && inbound.Listen[0] == '@' { listenAddress := host
if len(inbound.Listen) > 0 {
if inbound.Listen[0] == '@' {
listen, port, streamSettings, err := s.SubService.getFallbackMaster(inbound.Listen, inbound.StreamSettings) listen, port, streamSettings, err := s.SubService.getFallbackMaster(inbound.Listen, inbound.StreamSettings)
if err == nil { if err == nil {
inbound.Listen = listen listenAddress = listen
inbound.Port = port inbound.Port = port
inbound.StreamSettings = streamSettings inbound.StreamSettings = streamSettings
} }
} else {
listenAddress = inbound.Listen
}
} }
for _, client := range clients { for _, client := range clients {
if client.Enable && client.SubID == subId { if client.Enable && client.SubID == subId {
clientTraffics = append(clientTraffics, s.SubService.getClientTraffics(inbound.ClientStats, client.Email)) clientTraffics = append(clientTraffics, s.SubService.getClientTraffics(inbound.ClientStats, client.Email))
newConfigs := s.getConfig(inbound, client, host) newConfigs := s.getConfig(inbound, client, listenAddress)
configArray = append(configArray, newConfigs...) configArray = append(configArray, newConfigs...)
} }
} }
} }
if len(configArray) == 0 { if len(configArray) == 0 {
return "", "", nil return "", "", nil
} }

13
sub/subService.go
View file

@ -1,5 +1,7 @@
package sub package sub
// TODO: We need to create a service for link generation and remove link generation from the frontend
import ( import (
"encoding/base64" "encoding/base64"
"fmt" "fmt"
@ -33,9 +35,7 @@ func NewSubService(showInfo bool, remarkModel string) *SubService {
remarkModel: remarkModel, remarkModel: remarkModel,
} }
} }
func (s *SubService) GetSubs(subId string, host string) ([]string, string, error) { func (s *SubService) GetSubs(subId string, host string) ([]string, string, error) {
s.address = host
var result []string var result []string
var header string var header string
var traffic xray.ClientTraffic var traffic xray.ClientTraffic
@ -61,13 +61,18 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, string, error
if clients == nil { if clients == nil {
continue continue
} }
if len(inbound.Listen) > 0 && inbound.Listen[0] == '@' { s.address = host
if len(inbound.Listen) > 0 {
if inbound.Listen[0] == '@' {
listen, port, streamSettings, err := s.getFallbackMaster(inbound.Listen, inbound.StreamSettings) listen, port, streamSettings, err := s.getFallbackMaster(inbound.Listen, inbound.StreamSettings)
if err == nil { if err == nil {
inbound.Listen = listen s.address = listen
inbound.Port = port inbound.Port = port
inbound.StreamSettings = streamSettings inbound.StreamSettings = streamSettings
} }
} else {
s.address = inbound.Listen
}
} }
for _, client := range clients { for _, client := range clients {
if client.Enable && client.SubID == subId { if client.Enable && client.SubID == subId {