diff --git a/go.mod b/go.mod index bcf5d9b..d50d3c3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.4 require ( github.com/oneclickvirt/CommonMediaTests v0.0.2-20240630023003 - github.com/oneclickvirt/UnlockTests v0.0.9-20240630032239 + github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930 github.com/oneclickvirt/backtrace v0.0.4-20240624090335 github.com/oneclickvirt/basics v0.0.3-20240625075226 github.com/oneclickvirt/cputest v0.0.5-20240630022206 @@ -14,7 +14,7 @@ require ( github.com/oneclickvirt/nt3 v0.0.1-20240627070009 github.com/oneclickvirt/portchecker v0.0.1-20240624155429 github.com/oneclickvirt/security v0.0.1-20240625075931 - github.com/oneclickvirt/speedtest v0.0.4-20240629100548 + github.com/oneclickvirt/speedtest v0.0.5-20240630045424 ) require ( diff --git a/go.sum b/go.sum index 4a97f2b..2cab34f 100644 --- a/go.sum +++ b/go.sum @@ -91,6 +91,10 @@ github.com/oneclickvirt/UnlockTests v0.0.7-20240624115527 h1:rMC+aLDkvOe9K+AXjUt github.com/oneclickvirt/UnlockTests v0.0.7-20240624115527/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o= github.com/oneclickvirt/UnlockTests v0.0.9-20240630032239 h1:b2tf2AVZtTmDvOOtm7tmeOCqFJPm7fe2mF/0Kk15Mhk= github.com/oneclickvirt/UnlockTests v0.0.9-20240630032239/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o= +github.com/oneclickvirt/UnlockTests v0.0.10-20240630041851 h1:YC/Phn7I4hxlj+WvNfO7uHfKOSiNvd+3JA1vVkqKv1M= +github.com/oneclickvirt/UnlockTests v0.0.10-20240630041851/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o= +github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930 h1:/Sc4Eas1Pso18ak93wlazkuMKRRElCntITja/0opOpM= +github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o= github.com/oneclickvirt/backtrace v0.0.4-20240624090335 h1:0LP5KyA6GLlqQAtOF0uyBSAykHJrzOA96Eb87qUhGQw= github.com/oneclickvirt/backtrace v0.0.4-20240624090335/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8= github.com/oneclickvirt/basics v0.0.3-20240625075226 h1:K9VriCHIYnXPZXBSn9PRQX+jBS6AIFH8tBVb/i8VGAw= @@ -113,6 +117,8 @@ github.com/oneclickvirt/security v0.0.1-20240625075931 h1:Vj1Wq/JVcqYpfqUWRtsITb github.com/oneclickvirt/security v0.0.1-20240625075931/go.mod h1:6bjZjpYJ8M3aRIcLP61b0mjYRwvtWbYkvoGjS28Bdy4= github.com/oneclickvirt/speedtest v0.0.4-20240629100548 h1:DQA0R/EdtmLJrQBb9JvQBaBpcMgiGDvIHq+0quNZQQM= github.com/oneclickvirt/speedtest v0.0.4-20240629100548/go.mod h1:JNIxUbEJD12w81b7754RLHD55fsH6wHj+fCV2PqBDhk= +github.com/oneclickvirt/speedtest v0.0.5-20240630045424 h1:LXvoAgCAJVGci0Tzm3cDgvNaezncS8R5nOn8s+p+kNA= +github.com/oneclickvirt/speedtest v0.0.5-20240630045424/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI= github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM= github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= diff --git a/goecs.go b/goecs.go index 116c1dc..f29b094 100644 --- a/goecs.go +++ b/goecs.go @@ -72,6 +72,10 @@ func securityCheck() string { return securityInfo } +func mediatest(language string) string { + return unlocktest.MediaTest(language) +} + func printHead() { if language == "zh" { printCenteredTitle("融合怪测试", width) @@ -110,7 +114,7 @@ func main() { } startTime := time.Now() var wg sync.WaitGroup - var securityInfo, emailInfo string + var securityInfo, emailInfo, mediaInfo string if language == "zh" { printHead() printCenteredTitle("基础信息", width) @@ -136,13 +140,17 @@ func main() { emailInfo = email.EmailCheck() }() printCenteredTitle("御三家流媒体解锁", width) + go func() { + defer wg.Done() + mediaInfo = mediatest(language) + }() commediatest.ComMediaTest(language) printCenteredTitle("跨国流媒体解锁", width) - unlocktest.MediaTest(language) + wg.Wait() + fmt.Printf(mediaInfo) printCenteredTitle("IP质量检测", width) fmt.Printf(securityInfo) printCenteredTitle("邮件端口检测", width) - wg.Wait() fmt.Println(emailInfo) printCenteredTitle("三网回程", width) backtrace.BackTrace() diff --git a/unlocktest/media.go b/unlocktest/media.go index a68bb1f..2b882d2 100644 --- a/unlocktest/media.go +++ b/unlocktest/media.go @@ -7,17 +7,18 @@ import ( "github.com/oneclickvirt/defaultset" ) -func MediaTest(language string) { +func MediaTest(language string) string { readStatus := uts.ReadSelect(language, "0") if !readStatus { - return + return "" } if uts.IPV4 { fmt.Println(defaultset.Blue("IPV4:")) - uts.RunTests(utils.Ipv4HttpClient, "ipv4", language, false) + return uts.RunTests(utils.Ipv4HttpClient, "ipv4", language, false) } if uts.IPV6 { fmt.Println(defaultset.Blue("IPV6:")) - uts.RunTests(utils.Ipv6HttpClient, "ipv6", language, false) + return uts.RunTests(utils.Ipv6HttpClient, "ipv6", language, false) } + return "" } diff --git a/unlocktest/media_test.go b/unlocktest/media_test.go index a9cb85b..843faea 100644 --- a/unlocktest/media_test.go +++ b/unlocktest/media_test.go @@ -1,7 +1,10 @@ package unlocktest -import "testing" +import ( + "fmt" + "testing" +) func Test(t *testing.T) { - MediaTest("zh") + fmt.Printf(MediaTest("zh")) }