重构白银节点分配方式，使用手动接口精确配置节点

web/services/channel_baiyin.go

@@ -1,7 +1,6 @@
 package services
 
 import (
-	"database/sql/driver"
 	"encoding/json"
 	"fmt"
 	"log/slog"
@@ -24,10 +23,6 @@ import (
 type channelBaiyinService struct{}
 
 func (s *channelBaiyinService) CreateChannels(source netip.Addr, resourceId int32, authWhitelist bool, authPassword bool, count int, edgeFilter ...EdgeFilter) ([]*m.Channel, error) {
-	if count > 400 {
-		return nil, core.NewBizErr("单次最多提取 400 个")
-	}
-
 	var filter *EdgeFilter = nil
 	if len(edgeFilter) > 0 {
 		filter = &edgeFilter[0]
@@ -36,148 +31,114 @@ func (s *channelBaiyinService) CreateChannels(source netip.Addr, resourceId int3
 	now := time.Now()
 	batch := ID.GenReadable("bat")
 
-	// 获取用户套餐
-	resource, err := findResource(resourceId)
+	// 检查并获取套餐与白名单
+	resource, whitelists, err := ensure(now, source, resourceId, count)
 	if err != nil {
 		return nil, err
 	}
 
-	// 检查用户
 	user := resource.User
-	if user.IDToken == nil || *user.IDToken == "" {
-		return nil, core.NewBizErr("账号未实名")
-	}
-
-	// 获取用户白名单并检查用户 ip 地址
-	whitelists, err := q.Whitelist.Where(
-		q.Whitelist.UserID.Eq(user.ID),
-	).Find()
-	if err != nil {
-		return nil, err
-	}
-
-	whitelistIPs := make([]string, len(whitelists))
-	pass := false
-	for i, item := range whitelists {
-		whitelistIPs[i] = item.IP.String()
-		if item.IP.Addr == source {
-			pass = true
-		}
-	}
-	if !pass {
-		return nil, core.NewBizErr(fmt.Sprintf("IP 地址 %s 不在白名单内", source.String()))
-	}
-
-	// 检查套餐使用情况
-	switch resource.Mode {
-	default:
-		return nil, core.NewBizErr("不支持的套餐模式")
-
-	// 包时
-	case m.ResourceModeTime:
-		// 检查过期时间
-		if resource.Expire.Before(now) {
-			return nil, ErrResourceExpired
-		}
-		// 检查每日限额
-		used := 0
-		if now.Format("2006-01-02") == resource.DailyLast.Format("2006-01-02") {
-			used = int(resource.DailyUsed)
-		}
-		excess := used+count > int(resource.DailyLimit)
-		if excess {
-			return nil, ErrResourceDailyLimit
-		}
-
-	// 包量
-	case m.ResourceModeQuota:
-		// 检查可用配额
-		if int(resource.Quota)-int(resource.Used) < count {
-			return nil, ErrResourceExhausted
-		}
-	}
-
 	expire := now.Add(resource.Live)
 
+	// 选择代理
+	proxyResult := struct {
+		m.Proxy
+		Count int
+	}{}
+	err = q.Proxy.
+		LeftJoin(q.Channel, q.Channel.ProxyID.EqCol(q.Proxy.ID), q.Channel.ExpiredAt.Gt(now)).
+		Select(q.Proxy.ALL, field.NewUnsafeFieldRaw("10000 - count(*)").As("count")).
+		Where(
+			q.Proxy.Type.Eq(int(m.ProxyTypeBaiYin)),
+			q.Proxy.Status.Eq(int(m.ProxyStatusOnline)),
+		).
+		Group(q.Proxy.ID).
+		Order(field.NewField("", "count")).
+		Limit(1).Scan(&proxyResult)
+	if err != nil {
+		return nil, core.NewBizErr("获取可用代理失败", err)
+	}
+	if proxyResult.Count < count {
+		return nil, core.NewBizErr("无可用主机，请稍后再试")
+	}
+	proxy := proxyResult.Proxy
+
 	// 获取可用通道
-	chans, err := lockChans(batch, count, expire)
+	chans, err := lockChans(proxy.ID, batch, count)
 	if err != nil {
-		return nil, err
+		return nil, core.NewBizErr("无可用通道，请稍后再试", err)
 	}
 
-	// 获取对应代理
-	ips := make([]driver.Valuer, 0)
-	findProxy := make(map[orm.Inet]*m.Proxy)
-	for _, ch := range chans {
-		ip := orm.Inet{Addr: ch.Addr()}
-		if _, ok := findProxy[ip]; !ok {
-			ips = append(ips, ip)
-			findProxy[ip] = nil
-		}
-	}
-
-	proxies, err := q.Proxy.Where(
-		q.Proxy.Type.Eq(int(m.ProxyTypeBaiYin)),
-		q.Proxy.Status.Eq(int(m.ProxyStatusOnline)),
-		q.Proxy.IP.In(ips...),
-	).Find()
+	// 获取可用节点
+	edgesResp, err := g.Cloud.CloudEdges(&g.CloudEdgesReq{
+		Province:        filter.Prov,
+		City:            filter.City,
+		Isp:             u.X(filter.Isp.String()),
+		Limit:           &count,
+		NoRepeat:        u.P(true),
+		NoDayRepeat:     u.P(true),
+		ActiveTime:      u.P(3600),
+		IpUnchangedTime: u.P(3600),
+		Sort:            u.P("ip_unchanged_time_asc"),
+	})
 	if err != nil {
-		return nil, core.NewBizErr("获取代理失败", err)
+		return nil, core.NewBizErr("获取可用节点失败", err)
 	}
-
-	groups := make(map[*m.Proxy][]*m.Channel)
-	for _, proxy := range proxies {
-		findProxy[proxy.IP] = proxy
-		groups[proxy] = make([]*m.Channel, 0)
+	if edgesResp.Total != count && len(edgesResp.Edges) != count {
+		return nil, core.NewBizErr("无可用节点，请稍后再试")
 	}
+	edges := edgesResp.Edges
 
 	// 准备通道数据
-	actions := make([]*m.LogsUserUsage, len(chans))
-	channels := make([]*m.Channel, len(chans))
-	for i, ch := range chans {
+	channels := make([]*m.Channel, count)
+	chanConfigs := make([]*g.PortConfigsReq, count)
+	edgeConfigs := make([]string, count)
+	for i := range count {
+		ch := chans[i]
+		edge := edges[i]
+
 		if err != nil {
 			return nil, core.NewBizErr("解析通道地址失败", err)
 		}
 
-		// 使用记录
-		actions[i] = &m.LogsUserUsage{
-			UserID:     user.ID,
-			ResourceID: resourceId,
-			BatchNo:    batch,
-			Count:      int32(count),
-			ISP:        u.P(filter.Isp.String()),
-			Prov:       filter.Prov,
-			City:       filter.City,
-			IP:         orm.Inet{Addr: source},
-			Time:       now,
-		}
-
 		// 通道数据
-		inet := orm.Inet{Addr: ch.Addr()}
 		channels[i] = &m.Channel{
 			UserID:     user.ID,
 			ResourceID: resourceId,
 			BatchNo:    batch,
-			ProxyID:    findProxy[inet].ID,
+			ProxyID:    proxy.ID,
+			Host:       u.Else(proxy.Host, proxy.IP.String()),
 			Port:       ch.Port(),
+			EdgeRef:    u.P(edge.EdgeID),
 			FilterISP:  filter.Isp,
 			FilterProv: filter.Prov,
 			FilterCity: filter.City,
 			ExpiredAt:  expire,
-			Proxy:      *findProxy[inet],
 		}
+
+		// 通道配置数据
+		chanConfigs[i] = &g.PortConfigsReq{
+			Port:   int(ch.Port()),
+			Status: true,
+			Edge:   &[]string{edge.EdgeID},
+		}
+
+		// 白名单模式
 		if authWhitelist {
-			channels[i].Whitelists = u.P(strings.Join(whitelistIPs, ","))
+			channels[i].Whitelists = u.P(strings.Join(whitelists, ","))
+			chanConfigs[i].Whitelist = &whitelists
 		}
+
+		// 密码模式
 		if authPassword {
 			username, password := genPassPair()
 			channels[i].Username = &username
 			channels[i].Password = &password
+			chanConfigs[i].Userpass = u.P(username + ":" + password)
 		}
 
-		// 关联代理
-		proxy := findProxy[inet]
-		groups[proxy] = append(groups[proxy], channels[i])
+		// 连接配置数据
+		edgeConfigs[i] = edge.EdgeID
 	}
 
 	// 提交异步任务关闭通道
@@ -230,7 +191,7 @@ func (s *channelBaiyinService) CreateChannels(source netip.Addr, resourceId int3
 			return core.NewServErr("更新套餐使用记录失败", err)
 		}
 
-		// 保存通道和分配记录
+		// 保存通道
 		err = q.Channel.
 			Omit(field.AssociationFields).
 			Create(channels...)
@@ -238,7 +199,18 @@ func (s *channelBaiyinService) CreateChannels(source netip.Addr, resourceId int3
 			return core.NewServErr("保存通道失败", err)
 		}
 
-		err = q.LogsUserUsage.Create(actions...)
+		// 保存提取记录
+		err = q.LogsUserUsage.Create(&m.LogsUserUsage{
+			UserID:     user.ID,
+			ResourceID: resourceId,
+			BatchNo:    batch,
+			Count:      int32(count),
+			ISP:        u.P(filter.Isp.String()),
+			Prov:       filter.Prov,
+			City:       filter.City,
+			IP:         orm.Inet{Addr: source},
+			Time:       now,
+		})
 		if err != nil {
 			return core.NewServErr("保存用户使用记录失败", err)
 		}
@@ -250,37 +222,29 @@ func (s *channelBaiyinService) CreateChannels(source netip.Addr, resourceId int3
 	}
 
 	// 提交配置
-	for proxy, chanels := range groups {
-		secret := strings.Split(u.Z(proxy.Secret), ":")
-		gateway := g.NewGateway(proxy.IP.String(), secret[0], secret[1])
+	secret := strings.Split(u.Z(proxy.Secret), ":")
+	gateway := g.NewGateway(proxy.IP.String(), secret[0], secret[1])
+	if env.DebugExternalChange {
 
-		configs := make([]g.PortConfigsReq, len(chanels))
-		for i, channel := range chanels {
-			configs[i] = g.PortConfigsReq{
-				Port:   int(channel.Port),
-				Status: true,
-				AutoEdgeConfig: &g.AutoEdgeConfig{
-					Isp:      channel.FilterISP.String(),
-					Province: u.Z(channel.FilterProv),
-					City:     u.Z(channel.FilterCity),
-				},
-			}
-			if authWhitelist {
-				configs[i].Whitelist = &whitelistIPs
-			}
-			if authPassword {
-				configs[i].Userpass = u.P(fmt.Sprintf("%s:%s", *channel.Username, *channel.Password))
-			}
+		// 连接节点到网关
+		err = g.Cloud.CloudConnect(&g.CloudConnectReq{
+			Uuid: proxy.Mac,
+			Edge: &edgeConfigs,
+		})
+		if err != nil {
+			return nil, core.NewServErr("连接云平台失败", err)
 		}
 
-		if env.DebugExternalChange {
-			err := gateway.GatewayPortConfigs(configs)
-			if err != nil {
-				return nil, core.NewServErr(fmt.Sprintf("配置代理 %s 端口失败", proxy.IP.String()), err)
-			}
-		} else {
-			bytes, _ := json.Marshal(configs)
-			slog.Debug("提交代理端口配置", "proxy", proxy.IP.String(), "config", string(bytes))
+		// 启用网关代理通道
+		err = gateway.GatewayPortConfigs(chanConfigs)
+		if err != nil {
+			return nil, core.NewServErr(fmt.Sprintf("配置代理 %s 端口失败", proxy.IP.String()), err)
+		}
+	} else {
+		slog.Debug("提交代理端口配置", "proxy", proxy.IP.String())
+		for _, item := range chanConfigs {
+			str, _ := json.Marshal(item)
+			fmt.Println(string(str))
 		}
 	}
 
@@ -291,57 +255,58 @@ func (s *channelBaiyinService) RemoveChannels(batch string) error {
 	start := time.Now()
 
 	// 获取连接数据
-	channels, err := q.Channel.
-		Preload(q.Channel.Proxy).
-		Where(q.Channel.BatchNo.Eq(batch)).
-		Find()
+	channels, err := q.Channel.Where(q.Channel.BatchNo.Eq(batch)).Find()
 	if err != nil {
 		return core.NewServErr("获取通道数据失败", err)
 	}
 
-	proxies := make(map[string]*m.Proxy, len(channels))
-	groups := make(map[string][]*m.Channel, len(channels))
-	chans := make([]string, len(channels))
-	for i, channel := range channels {
-		ip := channel.Proxy.IP.String()
-		groups[ip] = append(groups[ip], channel)
-		proxies[ip] = &channel.Proxy
-		chans[i] = fmt.Sprintf("%s:%d", ip, channel.Port)
+	proxy, err := q.Proxy.Where(q.Proxy.ID.Eq(channels[0].ProxyID)).Take()
+	if err != nil {
+		return core.NewServErr("获取代理数据失败", err)
 	}
 
-	addrs := make([]netip.AddrPort, len(channels))
+	// 准备配置数据
+	edgeConfigs := make([]string, len(channels))
+	configs := make([]*g.PortConfigsReq, len(channels))
 	for i, channel := range channels {
-		addrs[i] = netip.AddrPortFrom(channel.Proxy.IP.Addr, channel.Port)
-	}
-
-	// 清空配置
-	for ip, channels := range groups {
-		proxy := proxies[ip]
-		secret := strings.Split(*proxy.Secret, ":")
-		gateway := g.NewGateway(ip, secret[0], secret[1])
-
-		configs := make([]g.PortConfigsReq, len(channels))
-		for i, channel := range channels {
-			configs[i] = g.PortConfigsReq{
-				Status: false,
-				Port:   int(channel.Port),
-				Edge:   &[]string{},
-			}
+		if channel.EdgeRef != nil {
+			edgeConfigs[i] = *channel.EdgeRef
+		} else {
+			slog.Warn(fmt.Sprintf("通道 %d 没有保存节点引用", channel.ID))
 		}
 
-		if env.DebugExternalChange {
-			err := gateway.GatewayPortConfigs(configs)
-			if err != nil {
-				return core.NewServErr(fmt.Sprintf("清空代理 %s 端口配置失败", proxy.IP.String()), err)
-			}
-		} else {
-			bytes, _ := json.Marshal(configs)
-			slog.Debug("清除代理端口配置", "proxy", ip, "config", string(bytes))
+		configs[i] = &g.PortConfigsReq{
+			Status: false,
+			Port:   int(channel.Port),
+			Edge:   &[]string{},
+		}
+	}
+
+	// 提交配置
+	if env.DebugExternalChange {
+		// 断开节点连接
+		g.Cloud.CloudDisconnect(&g.CloudDisconnectReq{
+			Uuid: proxy.Mac,
+			Edge: &edgeConfigs,
+		})
+
+		// 清空通道配置
+		secret := strings.Split(*proxy.Secret, ":")
+		gateway := g.NewGateway(proxy.IP.String(), secret[0], secret[1])
+		err := gateway.GatewayPortConfigs(configs)
+		if err != nil {
+			return core.NewServErr(fmt.Sprintf("清空代理 %s 端口配置失败", proxy.IP.String()), err)
+		}
+	} else {
+		slog.Debug("清除代理端口配置", "proxy", proxy.IP)
+		for _, item := range configs {
+			str, _ := json.Marshal(item)
+			fmt.Println(string(str))
 		}
 	}
 
 	// 释放端口
-	err = freeChans(batch, chans)
+	err = freeChans(proxy.ID, batch)
 	if err != nil {
 		return err
 	}