refactor with libdns

Author: orvice

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 ARG ARG_GOPROXY
 ENV GOPROXY $ARG_GOPROXY

cmd/ddns/main.go

@@ -5,20 +5,22 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/catpie/musdk-go"
+	"github.com/libdns/libdns"
+	"github.com/weeon/log"
 	"github.com/weeon/utils/task"
 
 	"github.com/orvice/ddns/dns"
 	"github.com/orvice/ddns/internal/config"
 	"github.com/orvice/ddns/internal/ip"
 	"github.com/orvice/ddns/notify"
-	"github.com/weeon/log"
 )
 
 var (
-	dnsProvider dns.DNS
+	dnsProvider dns.LibDNS
 	ipGetter    ip.IPGetter
 	muCli       *musdk.Client
 )
@@ -40,16 +42,8 @@ func Init() error {
 	}
 
 	switch config.DNS_MODE {
-	case config.DNS_MODE_MU:
-		dnsProvider, err = dns.NewMu(config.API_URI, config.NODE_ID)
-		if err != nil {
-			return err
-		}
 	default:
-		dnsProvider, err = dns.NewCloudFlare()
-		if err != nil {
-			return err
-		}
+		dnsProvider = dns.NewCloudFlare()
 	}
 
 	return nil
@@ -78,24 +72,67 @@ func main() {
 }
 
 func updateIP(ctx context.Context) error {
+	logger := slog.Default()
 	ip, err := ipGetter.GetIP()
 	if err != nil {
-		log.Errorf("Get ip error %v", err)
+		logger.Error("Get ip error", "error", err)
 		return err
 	}
 
-	currentIP, err := dnsProvider.GetIP(ctx, config.DOMAIN)
+	name, zone := zoneFromDomain(config.DOMAIN)
+	logger.Info("zone from domain",
+		"name", name,
+		"zone", zone)
+
+	currentIP, err := dnsProvider.GetRecords(ctx, zone)
 	if err != nil {
+		logger.Error("Get records error", "error", err)
 		return err
 	}
 
-	log.Infow("get ip",
-		"from_getter", ip,
-		"from_provider", currentIP)
-	err = dnsProvider.UpdateIP(ctx, config.DOMAIN, ip)
-	if err != nil {
-		log.Errorf("Update ip error %v", err)
-		return err
+	var found bool
+	var record *libdns.Record
+	for _, r := range currentIP {
+		if r.Name == name {
+			found = true
+			record = &r
+			break
+		}
 	}
+	if found {
+		if record.Value == ip {
+			logger.Info("ip is same, skip update", "ip", ip)
+			return nil
+		}
+		record.Value = ip
+		_, err = dnsProvider.SetRecords(ctx, zone, []libdns.Record{
+			*record,
+		})
+		if err != nil {
+			logger.Error("Set records error", "error", err)
+			return err
+		}
+	} else {
+		_, err = dnsProvider.AppendRecords(ctx, zone, []libdns.Record{
+			{
+				Name:  name,
+				Value: ip,
+			},
+		})
+		if err != nil {
+			logger.Error("Append records error", "error", err)
+			return err
+		}
+	}
+
 	return nil
 }
+
+// zoneFromDomain return zone and domain
+func zoneFromDomain(domain string) (string, string) {
+	arr := strings.SplitN(domain, ".", 2)
+	if len(arr) == 1 {
+		return "", ""
+	}
+	return arr[0], arr[1]
+}

dns/cloudflare.go

@@ -1,149 +1,12 @@
 package dns
 
 import (
-	"context"
-	"fmt"
-	"log/slog"
 	"os"
-	"strings"
 
-	"github.com/cloudflare/cloudflare-go"
-	"github.com/orvice/ddns/config"
-	"github.com/orvice/ddns/notify"
+	"github.com/libdns/cloudflare"
 )
 
-type CloudFlare struct {
-	client *cloudflare.API
-}
-
-func NewCloudFlare() (*CloudFlare, error) {
-	key := os.Getenv("CF_KEY")
-	email := os.Getenv("CF_EMAIL")
-	token := os.Getenv("CF_TOKEN")
-
-	var client *cloudflare.API
-	var err error
-
-	if token != "" {
-		slog.Info("cf use token")
-		client, err = cloudflare.NewWithAPIToken(token)
-	} else {
-		client, err = cloudflare.New(key, email)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	return &CloudFlare{
-		client: client,
-	}, nil
-}
-
-func (c *CloudFlare) getZone(ctx context.Context, domain string) (*cloudflare.Zone, error) {
-	zones, err := c.client.ListZones(ctx)
-	if err != nil {
-		slog.Error("list zones error", "err", err)
-		return nil, err
-	}
-
-	for _, z := range zones {
-		if strings.Contains(domain, z.Name) {
-			slog.Info("get zone success", "zone", z.Name, "id", z.ID)
-			return &z, nil
-		}
-	}
-	return nil, fmt.Errorf("not found zone")
-}
-
-func (c *CloudFlare) GetDomainZoneID(domain string) (string, error) {
-	var zoneID = os.Getenv("CF_ZONE_ID")
-	if zoneID != "" {
-		return zoneID, nil
-	}
-	zone, err := c.getZone(context.Background(), domain)
-	if err != nil {
-		slog.Error("get zone error", "err", err)
-	}
-	return zone.ID, nil
-}
-
-func (c *CloudFlare) GetIP(ctx context.Context, domain string) (string, error) {
-	zid, err := c.GetDomainZoneID(domain)
-	if err != nil {
-		return "", err
-	}
-	rs, ret, err := c.client.ListDNSRecords(ctx, &cloudflare.ResourceContainer{
-		// Name: domain,
-		Identifier: zid,
-	}, cloudflare.ListDNSRecordsParams{})
-	if err != nil {
-		return "", err
-	}
-	slog.Info("get dns records ", "count", ret.Count)
-
-	for _, v := range rs {
-		return v.Content, nil
-	}
-
-	return "", nil
-}
-
-func (c *CloudFlare) UpdateIP(ctx context.Context, domain, ip string) error {
-	zid, err := c.GetDomainZoneID(domain)
-	if err != nil {
-		return err
-	}
-	rs, ret, err := c.client.ListDNSRecords(ctx, &cloudflare.ResourceContainer{
-		// Name: domain,
-		Identifier: zid,
-	}, cloudflare.ListDNSRecordsParams{})
-	if err != nil {
-		return err
-	}
-	slog.Info("get dns records ", "count", ret.Count)
-	for _, r := range rs {
-		if r.Type == "A" {
-
-			if r.Name != domain {
-				slog.Info("record name not match",
-					"id", r.ID,
-					"record_name", r.Name,
-					"domain", domain,
-				)
-				continue
-			}
-
-			if r.Content == ip {
-				slog.Info("ip not change...")
-				continue
-			}
-
-			oldIP := r.Content
-			r.Content = ip
-			r, err = c.client.UpdateDNSRecord(ctx, cloudflare.ResourceIdentifier(zid), cloudflare.UpdateDNSRecordParams{
-				ID:      r.ID,
-				Type:    r.Type,
-				Name:    r.Name,
-				Content: ip,
-			})
-
-			slog.Info("update dns record",
-				"zone_id", zid,
-				"type", r.Type,
-				"record_id", r.ID,
-				"domain", domain,
-				"name", r.Name,
-				"old_ip", oldIP,
-				"new_ip", ip,
-			)
-
-			if err != nil {
-				slog.Error("update dns record error",
-					"err", err)
-				return err
-			}
-			notify.Notify(ctx, fmt.Sprintf(config.IpNotifyFormat, domain, oldIP, ip))
-		}
-	}
-	return nil
+func NewCloudFlare() LibDNS {
+	provider := cloudflare.Provider{APIToken: os.Getenv("CF_TOKEN")}
+	return &provider
 }

dns/cloudflate_test.go

@@ -0,0 +1,19 @@
+package dns
+
+import (
+	"context"
+	"os"
+	"testing"
+
+	"github.com/libdns/cloudflare"
+)
+
+func TestCloudFlare(t *testing.T) {
+	provider := cloudflare.Provider{APIToken: os.Getenv("CF_TOKEN")}
+	records, err := provider.GetRecords(context.Background(), os.Getenv("CF_ZONE"))
+	if err != nil {
+		t.Log(err)
+		return
+	}
+	t.Log(records)
+}

dns/dns.go

@@ -1,8 +1,11 @@
 package dns
 
-import "context"
+import (
+	"github.com/libdns/libdns"
+)
 
-type DNS interface {
-	GetIP(ctx context.Context, domain string) (string, error)
-	UpdateIP(ctx context.Context, domain, ip string) error
+type LibDNS interface {
+	libdns.RecordGetter
+	libdns.RecordAppender
+	libdns.RecordSetter
 }

go.mod

@@ -2,8 +2,9 @@ module github.com/orvice/ddns
 
 require (
 	github.com/catpie/musdk-go v0.0.0-20230815021801-7d27a00f9c60
-	github.com/cloudflare/cloudflare-go v0.75.0
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
+	github.com/libdns/cloudflare v0.1.1
+	github.com/libdns/libdns v0.2.2
 	github.com/orvice/utils v0.0.0-20180715141935-5b71615d9c36
 	github.com/weeon/log v0.0.0-20210217051817-63fe9a730962
 	github.com/weeon/utils v0.0.0-20190524044050-159b91233ff4
@@ -14,18 +15,15 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/go-redis/redis/v8 v8.5.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/weeon/contract v0.0.0-20190520152601-a4ee53bdb563 // indirect
 	go.opentelemetry.io/otel v0.16.0 // indirect
 	go.uber.org/atomic v1.6.0 // indirect
 	go.uber.org/multierr v1.5.0 // indirect
 	go.uber.org/zap v1.15.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )