From 1f4b151903d89d11d241022eab32af957e87fd77 Mon Sep 17 00:00:00 2001
From: DarcJC <me@darc.pro>
Date: Mon, 26 Feb 2024 11:40:53 +0800
Subject: [PATCH] refract: move ddns module to pkg/

---
 {service/singleton => pkg}/ddns/cloudflare.go |  0
 {service/singleton => pkg}/ddns/ddns.go       |  0
 {service/singleton => pkg}/ddns/dummy.go      |  0
 {service/singleton => pkg}/ddns/helper.go     |  0
 {service/singleton => pkg}/ddns/webhook.go    |  0
 service/rpc/nezha.go                          |  2 +-
 service/singleton/ddns.go                     | 14 +++++++-------
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename {service/singleton => pkg}/ddns/cloudflare.go (100%)
 rename {service/singleton => pkg}/ddns/ddns.go (100%)
 rename {service/singleton => pkg}/ddns/dummy.go (100%)
 rename {service/singleton => pkg}/ddns/helper.go (100%)
 rename {service/singleton => pkg}/ddns/webhook.go (100%)

diff --git a/service/singleton/ddns/cloudflare.go b/pkg/ddns/cloudflare.go
similarity index 100%
rename from service/singleton/ddns/cloudflare.go
rename to pkg/ddns/cloudflare.go
diff --git a/service/singleton/ddns/ddns.go b/pkg/ddns/ddns.go
similarity index 100%
rename from service/singleton/ddns/ddns.go
rename to pkg/ddns/ddns.go
diff --git a/service/singleton/ddns/dummy.go b/pkg/ddns/dummy.go
similarity index 100%
rename from service/singleton/ddns/dummy.go
rename to pkg/ddns/dummy.go
diff --git a/service/singleton/ddns/helper.go b/pkg/ddns/helper.go
similarity index 100%
rename from service/singleton/ddns/helper.go
rename to pkg/ddns/helper.go
diff --git a/service/singleton/ddns/webhook.go b/pkg/ddns/webhook.go
similarity index 100%
rename from service/singleton/ddns/webhook.go
rename to pkg/ddns/webhook.go
diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go
index 0228dcc025..f183043214 100644
--- a/service/rpc/nezha.go
+++ b/service/rpc/nezha.go
@@ -3,8 +3,8 @@ package rpc
 import (
 	"context"
 	"fmt"
+	"github.com/naiba/nezha/pkg/ddns"
 	"github.com/naiba/nezha/pkg/utils"
-	"github.com/naiba/nezha/service/singleton/ddns"
 	"log"
 	"time"
 
diff --git a/service/singleton/ddns.go b/service/singleton/ddns.go
index 900d358a68..810138a795 100644
--- a/service/singleton/ddns.go
+++ b/service/singleton/ddns.go
@@ -3,11 +3,11 @@ package singleton
 import (
 	"errors"
 	"fmt"
-	"github.com/naiba/nezha/service/singleton/ddns"
+	ddns2 "github.com/naiba/nezha/pkg/ddns"
 	"log"
 )
 
-func RetryableUpdateDomain(provider ddns.Provider, config *ddns.DomainConfig, maxRetries int) bool {
+func RetryableUpdateDomain(provider ddns2.Provider, config *ddns2.DomainConfig, maxRetries int) bool {
 	if nil == config {
 		return false
 	}
@@ -22,21 +22,21 @@ func RetryableUpdateDomain(provider ddns.Provider, config *ddns.DomainConfig, ma
 	return false
 }
 
-func GetDDNSProviderFromString(provider string) (ddns.Provider, error) {
+func GetDDNSProviderFromString(provider string) (ddns2.Provider, error) {
 	switch provider {
 	case "webhook":
-		return ddns.ProviderWebHook{
+		return ddns2.ProviderWebHook{
 			URL:           Conf.DDNS.WebhookURL,
 			RequestMethod: Conf.DDNS.WebhookMethod,
 			RequestBody:   Conf.DDNS.WebhookRequestBody,
 			RequestHeader: Conf.DDNS.WebhookHeaders,
 		}, nil
 	case "dummy":
-		return ddns.ProviderDummy{}, nil
+		return ddns2.ProviderDummy{}, nil
 	case "cloudflare":
-		return ddns.ProviderCloudflare{
+		return ddns2.ProviderCloudflare{
 			Secret: Conf.DDNS.AccessSecret,
 		}, nil
 	}
-	return ddns.ProviderDummy{}, errors.New(fmt.Sprintf("无法找到配置的DDNS提供者%s", Conf.DDNS.Provider))
+	return ddns2.ProviderDummy{}, errors.New(fmt.Sprintf("无法找到配置的DDNS提供者%s", Conf.DDNS.Provider))
 }