v1.4.1

internal/utils/apinodeutils/deploy_manager.go

@@ -1,10 +1,11 @@
 package apinodeutils
 
 import (
+	"regexp"
+
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
 	stringutil "github.com/iwind/TeaGo/utils/string"
-	"regexp"
 )
 
 // DeployManager 节点部署文件管理器

internal/utils/apinodeutils/manager.go

@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package apinodeutils
 

internal/utils/apinodeutils/upgrader.go

@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package apinodeutils
 
@@ -8,16 +8,17 @@ import (
 	"crypto/md5"
 	"errors"
 	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"runtime"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/types"
 	stringutil "github.com/iwind/TeaGo/utils/string"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
 )
 
 type Progress struct {

internal/utils/apinodeutils/upgrader_test.go

@@ -1,12 +1,13 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package apinodeutils_test
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/apinodeutils"
-	_ "github.com/iwind/TeaGo/bootstrap"
 	"runtime"
 	"testing"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/apinodeutils"
+	_ "github.com/iwind/TeaGo/bootstrap"
 )
 
 func TestUpgrader_CanUpgrade(t *testing.T) {

internal/utils/apinodeutils/utils.go

@@ -1,18 +1,19 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package apinodeutils
 
 import (
 	"bytes"
 	"errors"
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/iwind/TeaGo/Tea"
-	stringutil "github.com/iwind/TeaGo/utils/string"
 	"os"
 	"os/exec"
 	"regexp"
 	"runtime"
 	"strings"
+
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/iwind/TeaGo/Tea"
+	stringutil "github.com/iwind/TeaGo/utils/string"
 )
 
 func CanUpgrade(apiVersion string, osName string, arch string) (canUpgrade bool, reason string) {

internal/utils/dateutils/utils.go

@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package dateutils
 

internal/utils/dns.go

@@ -0,0 +1,81 @@
+package utils
+
+import (
+	"context"
+	"net"
+	"regexp"
+	"sync"
+	"time"
+
+	dig "github.com/TeaOSLab/EdgeCommon/pkg/utils"
+	"golang.org/x/net/idna"
+)
+
+func stringInSlice(str string, slice []string) bool {
+	for _, s := range slice {
+		if s == str {
+			return true
+		}
+	}
+	return false
+}
+
+func DnsCheck(domains []string, nodeIps []string) map[string]bool {
+	var wg sync.WaitGroup
+	ipMap := &sync.Map{}
+	concurrent := 10
+	counter := make(chan struct{}, concurrent)
+
+	for _, domain := range domains {
+		counter <- struct{}{}
+		wg.Add(1)
+		go func(domain string) {
+			defer func() {
+				<-counter
+				wg.Done()
+			}()
+			// 中文域名转换
+			if !regexp.MustCompile(`^[a-zA-Z0-9-.]+$`).MatchString(domain) {
+				unicodeDomain, err := idna.ToASCII(domain)
+				if err == nil && len(unicodeDomain) > 0 {
+					domain = unicodeDomain
+				}
+			}
+			dnsIps, err := dig.DigTraceIP(domain)
+			if err != nil || len(dnsIps) < 1 {
+				ipMap.Store(domain, false)
+			} else {
+				var flag = false
+				for _, ip := range dnsIps{
+					flag = stringInSlice(ip, nodeIps)
+					if flag {
+						break
+					}
+				}
+				ipMap.Store(domain, flag)
+			}
+
+		}(domain)
+	}
+
+	wg.Wait()
+
+	resultMap := make(map[string]bool)
+	ipMap.Range(func(key, value interface{}) bool {
+		resultMap[key.(string)] = value.(bool)
+		return true
+	})
+
+	return resultMap
+}
+
+func LookupIPWithTimeout(domain string, timeoutMS int64) ([]string, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(timeoutMS))
+	defer cancel()
+	r := net.DefaultResolver
+	ips, err := r.LookupHost(ctx, domain)
+	if err != nil {
+		return nil, err
+	}
+	return ips, nil
+}

internal/utils/email.go

@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils
 

internal/utils/email_test.go

@@ -1,11 +1,12 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils_test
 
 import (
+	"testing"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/iwind/TeaGo/assert"
-	"testing"
 )
 
 func TestValidateEmail(t *testing.T) {

internal/utils/exec/cmd.go

@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package executils
 

internal/utils/exec/cmd_test.go

@@ -1,11 +1,12 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package executils_test
 
 import (
-	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
 	"testing"
 	"time"
+
+	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
 )
 
 func TestNewTimeoutCmd_Sleep(t *testing.T) {

internal/utils/exec/look_linux.go

@@ -1,14 +1,15 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 //go:build linux
 
 package executils
 
 import (
-	"golang.org/x/sys/unix"
 	"io/fs"
 	"os"
 	"os/exec"
 	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 // LookPath customize our LookPath() function, to work in broken $PATH environment variable

internal/utils/exec/look_others.go

@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 //go:build !linux
 
 package executils

internal/utils/firewall.go

@@ -1,13 +1,14 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils
 
 import (
+	"os/exec"
+	"runtime"
+
 	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
-	"os/exec"
-	"runtime"
 )
 
 func AddPortsToFirewall(ports []int) {

internal/utils/ip_utils.go

@@ -3,10 +3,11 @@ package utils
 import (
 	"bytes"
 	"errors"
-	"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
-	"github.com/iwind/TeaGo/types"
 	"net"
 	"strings"
+
+	"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
+	"github.com/iwind/TeaGo/types"
 )
 
 // ParseIPValue 解析IP值

internal/utils/json_test.go

@@ -3,9 +3,10 @@
 package utils_test
 
 import (
+	"testing"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/iwind/TeaGo/assert"
-	"testing"
 )
 
 func TestJSONClone(t *testing.T) {
@@ -25,11 +26,10 @@ func TestJSONClone(t *testing.T) {
 	}
 }
 
-
 func TestJSONIsNull(t *testing.T) {
 	var a = assert.NewAssertion(t)
 	a.IsTrue(utils.JSONIsNull(nil))
 	a.IsTrue(utils.JSONIsNull([]byte{}))
 	a.IsTrue(utils.JSONIsNull([]byte("null")))
 	a.IsFalse(utils.JSONIsNull([]byte{1, 2, 3}))
-}
+}

internal/utils/lookup.go

@@ -1,12 +1,13 @@
 package utils
 
 import (
+	"sync"
+
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/miekg/dns"
-	"sync"
 )
 
 var sharedDNSClient *dns.Client

internal/utils/lookup_test.go

@@ -3,8 +3,9 @@
 package utils_test
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"testing"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 )
 
 func TestLookupCNAME(t *testing.T) {

internal/utils/numberutils/utils.go

@@ -2,10 +2,11 @@ package numberutils
 
 import (
 	"fmt"
-	"github.com/iwind/TeaGo/types"
 	"regexp"
 	"strconv"
 	"strings"
+
+	"github.com/iwind/TeaGo/types"
 )
 
 func FormatInt64(value int64) string {

internal/utils/numberutils/utils_test.go

@@ -3,9 +3,10 @@
 package numberutils_test
 
 import (
+	"testing"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/iwind/TeaGo/assert"
-	"testing"
 )
 
 func TestFormatBytes(t *testing.T) {

internal/utils/otputils/utils.go

@@ -1,4 +1,4 @@
-// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package otputils
 

internal/utils/otputils/utils_test.go

@@ -1,10 +1,11 @@
-// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package otputils_test
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/otputils"
 	"testing"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/otputils"
 )
 
 func TestFixIssuer(t *testing.T) {

internal/utils/service.go

@@ -1,14 +1,15 @@
 package utils
 
 import (
-	"github.com/iwind/TeaGo/Tea"
-	"github.com/iwind/TeaGo/files"
-	"github.com/iwind/TeaGo/logs"
 	"log"
 	"os"
 	"path/filepath"
 	"runtime"
 	"sync"
+
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/files"
+	"github.com/iwind/TeaGo/logs"
 )
 
 // 服务管理器
@@ -42,7 +43,7 @@ func (this *ServiceManager) setup() {
 			_ = logFile.Delete()
 		}
 
-		//logger
+		// logger
 		fp, err := os.OpenFile(Tea.Root+"/logs/service.log", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
 		if err != nil {
 			logs.Error(err)

internal/utils/service_linux.go

@@ -4,13 +4,14 @@ package utils
 
 import (
 	"errors"
+	"os"
+	"os/exec"
+	"regexp"
+
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
-	"os"
-	"os/exec"
-	"regexp"
 )
 
 var systemdServiceFile = "/etc/systemd/system/edge-admin.service"

internal/utils/service_test.go

@@ -1,8 +1,9 @@
 package utils
 
 import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"testing"
+
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 )
 
 func TestServiceManager_Log(t *testing.T) {

internal/utils/service_windows.go

@@ -4,12 +4,13 @@ package utils
 
 import (
 	"fmt"
+	"os/exec"
+
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
 	"golang.org/x/sys/windows/svc/mgr"
-	"os/exec"
 )
 
 // 安装服务

internal/utils/sizes/sizes_test.go

@@ -3,9 +3,10 @@
 package sizes_test
 
 import (
+	"testing"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/sizes"
 	"github.com/iwind/TeaGo/assert"
-	"testing"
 )
 
 func TestSizes(t *testing.T) {

internal/utils/strings.go

@@ -1,8 +1,9 @@
 package utils
 
 import (
-	"github.com/iwind/TeaGo/types"
 	"strings"
+
+	"github.com/iwind/TeaGo/types"
 )
 
 // FormatAddress format address

internal/utils/strings_stream.go

@@ -1,10 +1,11 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils
 
 import (
-	"github.com/iwind/TeaGo/lists"
 	"strings"
+
+	"github.com/iwind/TeaGo/lists"
 )
 
 func FilterNotEmpty(item string) bool {

internal/utils/strings_stream_test.go

@@ -1,11 +1,12 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils_test
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"strings"
 	"testing"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 )
 
 func TestStringsStream_Filter(t *testing.T) {

internal/utils/taskutils/concurrent.go

@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package taskutils
 

internal/utils/taskutils/concurrent_test.go

@@ -1,10 +1,11 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package taskutils_test
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/taskutils"
 	"testing"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/taskutils"
 )
 
 func TestRunConcurrent(t *testing.T) {

internal/utils/time.go

@@ -1,12 +1,13 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils
 
 import (
 	"errors"
 	"fmt"
-	"github.com/iwind/TeaGo/types"
 	"regexp"
+
+	"github.com/iwind/TeaGo/types"
 )
 
 // RangeTimes 计算时间点

internal/utils/upgrade_manager.go

@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils
 
@@ -8,12 +8,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
-	"github.com/iwind/TeaGo/Tea"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	stringutil "github.com/iwind/TeaGo/utils/string"
 	"io"
 	"net/http"
 	"os"
@@ -22,6 +16,13 @@ import (
 	"runtime"
 	"strings"
 	"time"
+
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	stringutil "github.com/iwind/TeaGo/utils/string"
 )
 
 type UpgradeFileWriter struct {

internal/utils/upgrade_manager_test.go

@@ -1,11 +1,12 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
 
 package utils_test
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"testing"
 	"time"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 )
 
 func TestNewUpgradeManager(t *testing.T) {