Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-04 04:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

small improvements (#958)

Browse Source 
* small improvements

* fix: return empty iterator if no json present

* use time.Tick

* changes
This commit is contained in:
UUBulb
2025-01-19 21:22:00 +08:00
committed by GitHub
parent 844865e2c1
commit 4b1af369e3
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/ddns/ddns.go
View File

@@ -48,11 +48,11 @@ func (provider *Provider) UpdateDomain(ctx context.Context) {
for _, domain := range provider.DDNSProfile.Domains {
for retries := 0; retries < int(provider.DDNSProfile.MaxRetries); retries++ {
provider.domain = domain
log.Printf("NEZHA>> 正在尝试更新域名(%s)DDNS(%d/%d)", provider.domain, retries+1, provider.DDNSProfile.MaxRetries)
log.Printf("NEZHA>> Updating DNS Record of domain %s: %d/%d", provider.domain, retries+1, provider.DDNSProfile.MaxRetries)
if err := provider.updateDomain(); err != nil {
log.Printf("NEZHA>> 尝试更新域名(%s)DDNS失败: %v", provider.domain, err)
log.Printf("NEZHA>> Failed to update DNS record of domain %s: %v", provider.domain, err)
} else {
log.Printf("NEZHA>> 尝试更新域名(%s)DDNS成功", provider.domain)
log.Printf("NEZHA>> Update DNS record of domain %s succeed", provider.domain)
break
}
}

4
pkg/ddns/webhook/webhook.go
View File

@@ -77,7 +77,7 @@ func (provider *Provider) prepareRequest(ctx context.Context) (*http.Request, er
return nil, err
}
headers, err := utils.GjsonParseStringMap(
headers, err := utils.GjsonIter(
provider.formatWebhookString(provider.DDNSProfile.WebhookHeaders))
if err != nil {
return nil, err
@@ -139,7 +139,7 @@ func (provider *Provider) reqBody() (string, error) {
case requestTypeJSON:
return provider.formatWebhookString(provider.DDNSProfile.WebhookRequestBody), nil
case requestTypeForm:
data, err := utils.GjsonParseStringMap(provider.DDNSProfile.WebhookRequestBody)
data, err := utils.GjsonIter(provider.DDNSProfile.WebhookRequestBody)
if err != nil {
return "", err
}

23
pkg/utils/gjson.go
View File

@@ -2,6 +2,7 @@ package utils
import (
"errors"
"iter"
"github.com/tidwall/gjson"
)
@@ -11,6 +12,8 @@ var (
ErrGjsonWrongType = errors.New("wrong type")
)
var emptyIterator = func(yield func(string, string) bool) {}
func GjsonGet(json []byte, path string) (gjson.Result, error) {
result := gjson.GetBytes(json, path)
if !result.Exists() {
@@ -20,21 +23,19 @@ func GjsonGet(json []byte, path string) (gjson.Result, error) {
return result, nil
}
func GjsonParseStringMap(jsonObject string) (map[string]string, error) {
if jsonObject == "" {
return nil, nil
func GjsonIter(json string) (iter.Seq2[string, string], error) {
if json == "" {
return emptyIterator, nil
}
result := gjson.Parse(jsonObject)
result := gjson.Parse(json)
if !result.IsObject() {
return nil, ErrGjsonWrongType
}
ret := make(map[string]string)
result.ForEach(func(key, value gjson.Result) bool {
ret[key.String()] = value.String()
return true
})
return ret, nil
return func(yield func(string, string) bool) {
result.ForEach(func(k, v gjson.Result) bool {
return yield(k.String(), v.String())
})
}, nil
}