v2.7.2
This commit is contained in:
心隨緣動
GitHub
parent
ea2d69fe38
commit
fb1c0cccfd
@ -102,8 +102,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
xrayConfig := &xray.Config{}
|
xrayConfig := &xray.Config{}
|
||||||
err = json.Unmarshal([]byte(templateConfig), xrayConfig)
|
if err := json.Unmarshal([]byte(templateConfig), xrayConfig); err != nil {
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,10 +123,10 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// 获取该入站下的所有客户端设置
|
// 获取该入站下的所有客户端设置
|
||||||
clients, _ := s.inboundService.GetClients(inbound)
|
dbClients, _ := s.inboundService.GetClients(inbound)
|
||||||
for _, client := range clients {
|
for _, dbClient := range dbClients {
|
||||||
if client.SpeedLimit > 0 {
|
if dbClient.SpeedLimit > 0 {
|
||||||
uniqueSpeeds[client.SpeedLimit] = true
|
uniqueSpeeds[dbClient.SpeedLimit] = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -144,20 +143,19 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
|
|||||||
// 为每个速率创建一个 level，level 的名字就是速率的字符串形式
|
// 为每个速率创建一个 level，level 的名字就是速率的字符串形式
|
||||||
// 例如，速率 1024 KB/s 对应 level "1024"
|
// 例如，速率 1024 KB/s 对应 level "1024"
|
||||||
policyLevels[strconv.Itoa(speed)] = map[string]interface{}{
|
policyLevels[strconv.Itoa(speed)] = map[string]interface{}{
|
||||||
"downlinkOnly": speed, // 限制下载速度
|
"downlinkOnly": speed,
|
||||||
"uplinkOnly": speed, // 同时限制上传速度 (您可以根据需要调整)
|
"uplinkOnly": speed,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 将生成的 policy 应用到 Xray 配置中
|
// 将生成的 policy 应用到 Xray 配置中
|
||||||
policyJSON, err := json.Marshal(map[string]interface{}{
|
policyJSON, err := json.Marshal(map[string]interface{}{"levels": policyLevels})
|
||||||
"levels": policyLevels,
|
|
||||||
})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
xrayConfig.Policy = json_util.RawMessage(policyJSON)
|
xrayConfig.Policy = json_util.RawMessage(policyJSON)
|
||||||
|
|
||||||
|
|
||||||
// =================================================================
|
// =================================================================
|
||||||
// 中文注释: 在这里增加日志，打印最终生成的限速策略
|
// 中文注释: 在这里增加日志，打印最终生成的限速策略
|
||||||
// =================================================================
|
// =================================================================
|
||||||
@ -165,106 +163,188 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
|
|||||||
finalPolicyLog, _ := json.Marshal(policyLevels)
|
finalPolicyLog, _ := json.Marshal(policyLevels)
|
||||||
logger.Infof("已为Xray动态生成〔限速策略〕: %s", string(finalPolicyLog))
|
logger.Infof("已为Xray动态生成〔限速策略〕: %s", string(finalPolicyLog))
|
||||||
}
|
}
|
||||||
// =================================================================
|
|
||||||
|
|
||||||
|
|
||||||
// =================================================================
|
// =================================================================
|
||||||
// 中文注释: 动态限速核心逻辑 - 第三步: 为设置了限速的用户分配对应的 Level
|
// 中文注释: 动态限速核心逻辑 - 第三步: 为设置了限速的用户分配对应的 Level，逐个 inbound 构建 inboundConfig
|
||||||
// =================================================================
|
// =================================================================
|
||||||
for _, inbound := range inbounds {
|
for _, inbound := range inbounds {
|
||||||
if !inbound.Enable {
|
if !inbound.Enable {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// get settings clients
|
|
||||||
settings := map[string]any{}
|
// 先生成一个 inboundConfig（后面会覆盖 Settings/StreamSettings）
|
||||||
json.Unmarshal([]byte(inbound.Settings), &settings)
|
inboundConfig := inbound.GenXrayInboundConfig()
|
||||||
clients, ok := settings["clients"].([]any)
|
|
||||||
if ok {
|
// 从 DB clients 建立 email/id -> speedLimit 映射（优先使用 DB 的值）
|
||||||
// check users active or not
|
speedByEmail := make(map[string]int)
|
||||||
clientStats := inbound.ClientStats
|
speedById := make(map[string]int)
|
||||||
for _, clientTraffic := range clientStats {
|
dbClients, _ := s.inboundService.GetClients(inbound)
|
||||||
indexDecrease := 0
|
for _, dbc := range dbClients {
|
||||||
for index, client := range clients {
|
if dbc.Email != "" {
|
||||||
c := client.(map[string]any)
|
speedByEmail[dbc.Email] = dbc.SpeedLimit
|
||||||
if c["email"] == clientTraffic.Email {
|
|
||||||
if !clientTraffic.Enable {
|
|
||||||
clients = RemoveIndex(clients, index-indexDecrease)
|
|
||||||
indexDecrease++
|
|
||||||
logger.Infof("Remove Inbound User %s due to expiration or traffic limit", c["email"])
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// 如果有 id 字段也建立映射（以防 email 不存在）
|
||||||
|
if dbc.ID != "" {
|
||||||
|
speedById[dbc.ID] = dbc.SpeedLimit
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// clear client config for additional parameters
|
// 解析 inbound.Settings
|
||||||
var final_clients []any
|
var settings map[string]interface{}
|
||||||
for _, client := range clients {
|
if err := json.Unmarshal([]byte(inbound.Settings), &settings); err != nil {
|
||||||
c := client.(map[string]any)
|
logger.Warningf("无法解析 inbound.Settings (inbound %d): %v ，跳过该入站", inbound.Id, err)
|
||||||
if enable, ok := c["enable"].(bool); ok && !enable { continue }
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
originalClients, ok := settings["clients"].([]interface{})
|
||||||
|
if ok {
|
||||||
|
clientStats := inbound.ClientStats
|
||||||
|
|
||||||
|
var xrayClients []interface{}
|
||||||
|
for _, clientRaw := range originalClients {
|
||||||
|
c, ok := clientRaw.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
// 中文注释: 用户过滤 - 1) settings 中的 enable 字段检查
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
if en, ok := c["enable"].(bool); ok && !en {
|
||||||
|
if em, _ := c["email"].(string); em != "" {
|
||||||
|
logger.Infof("已从Xray配置中移除被settings标记为禁用的用户: %s", em)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
// 中文注释: 用户过滤 - 2) inbound.ClientStats 检查 (DB/流量层禁用)
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
email, _ := c["email"].(string)
|
||||||
|
idStr, _ := c["id"].(string)
|
||||||
|
disabledByStat := false
|
||||||
|
for _, stat := range clientStats {
|
||||||
|
if stat.Email == email && !stat.Enable {
|
||||||
|
disabledByStat = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if disabledByStat {
|
||||||
|
logger.Infof("已从Xray配置中移除被禁用的用户: %s", email)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
// 中文注释: 构建干净的 xrayClient（只保留白名单字段）
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
xrayClient := make(map[string]interface{})
|
||||||
|
if id, ok := c["id"]; ok { xrayClient["id"] = id }
|
||||||
|
if email != "" { xrayClient["email"] = email }
|
||||||
|
|
||||||
|
// 规范化 flow
|
||||||
|
if flow, ok := c["flow"]; ok {
|
||||||
|
if fs, ok2 := flow.(string); ok2 && fs == "xtls-rprx-vision-udp443" {
|
||||||
|
xrayClient["flow"] = "xtls-rprx-vision"
|
||||||
|
} else {
|
||||||
|
xrayClient["flow"] = flow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if password, ok := c["password"]; ok { xrayClient["password"] = password }
|
||||||
|
if method, ok := c["method"]; ok { xrayClient["method"] = method }
|
||||||
|
|
||||||
|
// ⚠️ security 字段已移除，不再加入到 xrayClient
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
// 中文注释: 限速等级映射（优先 DB，再回退 settings.speedLimit）
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
|
||||||
// =================================================================
|
// =================================================================
|
||||||
// 这里的逻辑是准备将 client 对象提交给 Xray-core。
|
// 这里的逻辑是准备将 client 对象提交给 Xray-core。
|
||||||
// 我们需要将 speedLimit 转换为 Xray 认识的 level 字段。
|
// 我们需要将 speedLimit 转换为 Xray 认识的 level 字段。
|
||||||
// 并且，我们不再删除任何字段，因为 Xray-core 会自动忽略它不认识的字段。
|
|
||||||
// 这样可以确保包含 speedLimit 的完整用户信息被用于生成配置。
|
// 这样可以确保包含 speedLimit 的完整用户信息被用于生成配置。
|
||||||
// =================================================================
|
// =================================================================
|
||||||
if speedLimit, ok := c["speedLimit"].(float64); ok && speedLimit > 0 {
|
level := 0
|
||||||
c["level"] = int(speedLimit)
|
if email != "" {
|
||||||
|
if v, ok := speedByEmail[email]; ok && v > 0 {
|
||||||
|
level = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if level == 0 && idStr != "" {
|
||||||
|
if v, ok := speedById[idStr]; ok && v > 0 {
|
||||||
|
level = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if level == 0 {
|
||||||
|
if sl, ok := c["speedLimit"]; ok {
|
||||||
|
switch vv := sl.(type) {
|
||||||
|
case float64:
|
||||||
|
level = int(vv)
|
||||||
|
case int:
|
||||||
|
level = vv
|
||||||
|
case int64:
|
||||||
|
level = int(vv)
|
||||||
|
case string:
|
||||||
|
if n, err := strconv.Atoi(vv); err == nil {
|
||||||
|
level = n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 【新增功能】在这里添加日志记录
|
// 【新增功能】在这里添加日志记录
|
||||||
if email, emailOk := c["email"].(string); emailOk {
|
// 只有当最终计算出的 level 大于 0，且 email 存在时，才记录日志
|
||||||
logger.Infof("为用户 %s 应用〔独立限速〕: %d KB/s", email, int(speedLimit))
|
if level > 0 && email != "" {
|
||||||
|
logger.Infof("为用户 %s 应用〔独立限速〕: %d KB/s", email, level)
|
||||||
}
|
}
|
||||||
} else {
|
// =================================================================
|
||||||
c["level"] = 0
|
|
||||||
|
xrayClient["level"] = level
|
||||||
|
|
||||||
|
xrayClients = append(xrayClients, xrayClient)
|
||||||
}
|
}
|
||||||
|
|
||||||
if c["flow"] == "xtls-rprx-vision-udp443" {
|
// 把纯净的 clients 应用到 settings，并写入 inboundConfig.Settings
|
||||||
c["flow"] = "xtls-rprx-vision"
|
settings["clients"] = xrayClients
|
||||||
}
|
finalSettingsForXray, err := json.Marshal(settings)
|
||||||
|
|
||||||
final_clients = append(final_clients, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
settings["clients"] = final_clients
|
|
||||||
modifiedSettings, err := json.MarshalIndent(settings, "", " ")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
logger.Warningf("无法序列化用于Xray的入站设置 in GetXrayConfig for inbound %d: %v，跳过该入站", inbound.Id, err)
|
||||||
}
|
continue
|
||||||
|
}
|
||||||
inbound.Settings = string(modifiedSettings)
|
inboundConfig.Settings = json_util.RawMessage(finalSettingsForXray)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------
|
||||||
|
// 中文注释: 处理 StreamSettings（清理敏感字段）
|
||||||
|
// -----------------------------------------------------------------
|
||||||
if len(inbound.StreamSettings) > 0 {
|
if len(inbound.StreamSettings) > 0 {
|
||||||
// Unmarshal stream JSON
|
var stream map[string]interface{}
|
||||||
var stream map[string]any
|
if err := json.Unmarshal([]byte(inbound.StreamSettings), &stream); err != nil {
|
||||||
json.Unmarshal([]byte(inbound.StreamSettings), &stream)
|
logger.Warningf("无法解析 StreamSettings (inbound %d): %v ，跳过该入站", inbound.Id, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
// Remove the "settings" field under "tlsSettings" and "realitySettings"
|
if tlsSettings, ok := stream["tlsSettings"].(map[string]interface{}); ok {
|
||||||
tlsSettings, ok1 := stream["tlsSettings"].(map[string]any)
|
|
||||||
realitySettings, ok2 := stream["realitySettings"].(map[string]any)
|
|
||||||
if ok1 || ok2 {
|
|
||||||
if ok1 {
|
|
||||||
delete(tlsSettings, "settings")
|
delete(tlsSettings, "settings")
|
||||||
} else if ok2 {
|
}
|
||||||
|
if realitySettings, ok := stream["realitySettings"].(map[string]interface{}); ok {
|
||||||
delete(realitySettings, "settings")
|
delete(realitySettings, "settings")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
delete(stream, "externalProxy")
|
delete(stream, "externalProxy")
|
||||||
|
|
||||||
newStream, err := json.MarshalIndent(stream, "", " ")
|
newStream, err := json.Marshal(stream)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
inbound.StreamSettings = string(newStream)
|
inboundConfig.StreamSettings = json_util.RawMessage(newStream)
|
||||||
}
|
}
|
||||||
|
|
||||||
inboundConfig := inbound.GenXrayInboundConfig()
|
|
||||||
xrayConfig.InboundConfigs = append(xrayConfig.InboundConfigs, *inboundConfig)
|
xrayConfig.InboundConfigs = append(xrayConfig.InboundConfigs, *inboundConfig)
|
||||||
}
|
}
|
||||||
|
|
||||||
return xrayConfig, nil
|
return xrayConfig, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func (s *XrayService) GetXrayTraffic() ([]*xray.Traffic, []*xray.ClientTraffic, error) {
|
func (s *XrayService) GetXrayTraffic() ([]*xray.Traffic, []*xray.ClientTraffic, error) {
|
||||||
if !s.IsXrayRunning() {
|
if !s.IsXrayRunning() {
|
||||||
err := errors.New("xray is not running")
|
err := errors.New("xray is not running")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user