update ddns on server update (#1050)

service/rpc/nezha.go

@@ -6,15 +6,12 @@ import (
 	"fmt"
 	"log"
 	"net"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/jinzhu/copier"
-	"github.com/nezhahq/nezha/pkg/ddns"
 	geoipx "github.com/nezhahq/nezha/pkg/geoip"
 	"github.com/nezhahq/nezha/pkg/grpcx"
-	"github.com/nezhahq/nezha/pkg/utils"
 
 	"github.com/nezhahq/nezha/model"
 	pb "github.com/nezhahq/nezha/proto"
@@ -239,19 +236,8 @@ func (s *NezhaHandler) ReportGeoIP(c context.Context, r *pb.GeoIP) (*pb.GeoIP, e
 		ipv4 := geoip.IP.IPv4Addr
 		ipv6 := geoip.IP.IPv6Addr
 
-		dnsServers := strings.Split(singleton.Conf.DNSServers, ",")
-		ctx := context.WithValue(context.Background(), ddns.DNSServerKey{}, utils.IfOr(dnsServers[0] != "", dnsServers, utils.DNSServers))
-
-		providers, err := singleton.DDNSShared.GetDDNSProvidersFromProfiles(server.DDNSProfiles, &model.IP{IPv4Addr: ipv4, IPv6Addr: ipv6})
-		if err == nil {
-			for _, provider := range providers {
-				domains := server.OverrideDDNSDomains[provider.GetProfileID()]
-				go func(provider *ddns.Provider) {
-					provider.UpdateDomain(ctx, domains...)
-				}(provider)
-			}
-		} else {
-			log.Printf("NEZHA>> Failed to retrieve DDNS configuration: %v", err)
+		if err := singleton.ServerShared.UpdateDDNS(server, &model.IP{IPv4Addr: ipv4, IPv6Addr: ipv6}); err != nil {
+			log.Printf("NEZHA>> Failed to update DDNS for server %d: %v", err, server.ID)
 		}
 	}
 

service/singleton/ddns.go

@@ -65,7 +65,7 @@ func (c *DDNSClass) GetDDNSProvidersFromProfiles(profileId []uint64, ip *model.I
 			profiles = append(profiles, profile)
 		} else {
 			c.listMu.RUnlock()
-			return nil, fmt.Errorf("无法找到DDNS配置 ID %d", id)
+			return nil, fmt.Errorf("cannot find DDNS profile %d", id)
 		}
 	}
 	c.listMu.RUnlock()
@@ -90,7 +90,7 @@ func (c *DDNSClass) GetDDNSProvidersFromProfiles(profileId []uint64, ip *model.I
 			provider.Setter = &he.Provider{APIKey: profile.AccessSecret}
 			providers = append(providers, provider)
 		default:
-			return nil, fmt.Errorf("无法找到配置的DDNS提供者 %s", profile.Provider)
+			return nil, fmt.Errorf("cannot find DDNS provider %s", profile.Provider)
 		}
 	}
 	return providers, nil

service/singleton/server.go

@@ -2,9 +2,13 @@ package singleton
 
 import (
 	"cmp"
+	"context"
+	"log"
 	"slices"
+	"strings"
 
 	"github.com/nezhahq/nezha/model"
+	"github.com/nezhahq/nezha/pkg/ddns"
 	"github.com/nezhahq/nezha/pkg/utils"
 )
 
@@ -14,14 +18,19 @@ type ServerClass struct {
 	uuidToID map[string]uint64
 
 	sortedListForGuest []*model.Server
+
+	conf *ConfigClass
+	dc   *DDNSClass
 }
 
-func NewServerClass() *ServerClass {
+func NewServerClass(conf *ConfigClass, dc *DDNSClass) *ServerClass {
 	sc := &ServerClass{
 		class: class[uint64, *model.Server]{
 			list: make(map[uint64]*model.Server),
 		},
 		uuidToID: make(map[string]uint64),
+		conf:     conf,
+		dc:       dc,
 	}
 
 	var servers []model.Server
@@ -47,6 +56,12 @@ func (c *ServerClass) Update(s *model.Server, uuid string) {
 
 	c.listMu.Unlock()
 
+	if s.EnableDDNS {
+		if err := c.UpdateDDNS(s, nil); err != nil {
+			log.Printf("NEZHA>> Failed to update DDNS for server %d: %v", err, s.ID)
+		}
+	}
+
 	c.sortList()
 }
 
@@ -79,6 +94,25 @@ func (c *ServerClass) UUIDToID(uuid string) (id uint64, ok bool) {
 	return
 }
 
+func (c *ServerClass) UpdateDDNS(server *model.Server, ip *model.IP) error {
+	confServers := strings.Split(c.conf.DNSServers, ",")
+	ctx := context.WithValue(context.Background(), ddns.DNSServerKey{}, utils.IfOr(confServers[0] != "", confServers, utils.DNSServers))
+
+	providers, err := c.dc.GetDDNSProvidersFromProfiles(server.DDNSProfiles, utils.IfOr(ip != nil, ip, &server.GeoIP.IP))
+	if err != nil {
+		return err
+	}
+
+	for _, provider := range providers {
+		domains := server.OverrideDDNSDomains[provider.GetProfileID()]
+		go func(provider *ddns.Provider) {
+			provider.UpdateDomain(ctx, domains...)
+		}(provider)
+	}
+
+	return nil
+}
+
 func (c *ServerClass) sortList() {
 	c.listMu.RLock()
 	defer c.listMu.RUnlock()

service/singleton/singleton.go

@@ -52,13 +52,13 @@ func InitTimezoneAndCache() error {
 
 // LoadSingleton 加载子服务并执行
 func LoadSingleton(bus chan<- *model.Service) (err error) {
-	initUser()                                  // 加载用户ID绑定表
-	initI18n()                                  // 加载本地化服务
-	NotificationShared = NewNotificationClass() // 加载通知服务
-	ServerShared = NewServerClass()             // 加载服务器列表
-	CronShared = NewCronClass()                 // 加载定时任务
+	initUser() // 加载用户ID绑定表
+	initI18n() // 加载本地化服务
 	NATShared = NewNATClass()
 	DDNSShared = NewDDNSClass()
+	NotificationShared = NewNotificationClass()     // 加载通知服务
+	ServerShared = NewServerClass(Conf, DDNSShared) // 加载服务器列表
+	CronShared = NewCronClass()                     // 加载定时任务
 	ServiceSentinelShared, err = NewServiceSentinel(bus, ServerShared, NotificationShared, CronShared)
 	return
 }