pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-01 10:45:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(clients): bind host rules to individual clients in subscriptions (#6620)

Browse Source 
Host rules applied per inbound only, so every client of an inbound got the same
subscription endpoints (#6618). A client can now be bound to one or more host
rules, and its raw, JSON and Clash subscriptions render only those hosts, in
either subscription order; an unbound client is unchanged. A binding whose hosts
are deleted, disabled or excluded from the format fails closed: the client gets
no links there but stays in traffic accounting. Host edits keep row ids, so
bindings survive them; nil leaves a stored binding alone and an empty list
clears it.
This commit is contained in:
Nethmina Yasas
2026-10-24 16:03:02 +05:30
committed by GitHub
parent d103c0c012
commit bc1b750e00
47 changed files with 1940 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/service.go
+23 -5
View File
@@ -513,7 +513,12 @@ func (s *SubService) getSubs(subId string) ([]string, []string, int64, xray.Clie
}
var link string
if s.hostsFirst {
for _, variant := range s.subscriptionHostVariants(inbound, "raw") {
variants, closed := s.clientHostVariants(inbound, client, "raw")
if closed {
seenEmails[client.Email] = struct{}{}
continue
}
for _, variant := range variants {
render := func() string {
if variant.host != nil {
return s.linkFromHosts(inbound, client, variant.endpoint(s, inbound))
@@ -522,8 +527,14 @@ func (s *SubService) getSubs(subId string) ([]string, []string, int64, xray.Clie
}
ordered = append(ordered, orderedSubEntry[func() string]{variant.order, render})
}
} else if len(hostEps) > 0 {
link = s.linkFromHosts(inbound, client, hostEps)
} else if effectiveEps, bound := s.clientHostEndpoints(inbound, client, "raw", hostEps); bound && len(effectiveEps) == 0 {
seenEmails[client.Email] = struct{}{}
continue
} else if len(effectiveEps) > 0 {
link = s.linkFromHosts(inbound, client, effectiveEps)
if link == "" {
link = s.GetLink(inbound, client.Email)
}
} else {
link = s.GetLink(inbound, client.Email)
}
@@ -601,9 +612,16 @@ func (s *SubService) inboundLinks(inbound *model.Inbound) []string {
continue
}
seen[key] = struct{}{}
effectiveEps, bound := s.clientHostEndpoints(inbound, client, "raw", hostEps)
if bound && len(effectiveEps) == 0 {
continue
}
var link string
if len(hostEps) > 0 {
link = s.linkFromHosts(inbound, client, hostEps)
if len(effectiveEps) > 0 {
link = s.linkFromHosts(inbound, client, effectiveEps)
if link == "" {
link = s.GetLink(inbound, client.Email)
}
} else {
link = s.GetLink(inbound, client.Email)
}