apps/ecs
1
0
Fork 0
mirror of https://github.com/oneclickvirt/ecs.git synced 2025-12-24 12:37:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 进一步重构组织架构

Browse Source
This commit is contained in:
spiritlhl
2025-11-02 16:54:38 +00:00
parent 40f63e6cb1
commit c6f3e7a285
15 changed files with 39 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cputest/cputest_test.go
View File

@@ -1,11 +0,0 @@
package cputest
import (
"fmt"
"testing"
)
func Test(t *testing.T) {
_, res := CpuTest("zh", "sysbench", "1")
fmt.Print(res)
}

11
disktest/disktest_test.go
View File

@@ -1,11 +0,0 @@
package disktest
import (
"fmt"
"testing"
)
func TestDiskIoTest(t *testing.T) {
_, res := DiskTest("zh", "sysbench", "", false, false)
fmt.Print(res)
}

62
internal/runner/runner.go
View File

@@ -10,14 +10,8 @@ import (
"time"
"github.com/oneclickvirt/CommonMediaTests/commediatests"
"github.com/oneclickvirt/ecs/cputest"
"github.com/oneclickvirt/ecs/disktest"
"github.com/oneclickvirt/ecs/internal/params"
"github.com/oneclickvirt/ecs/memorytest"
"github.com/oneclickvirt/ecs/nexttrace"
"github.com/oneclickvirt/ecs/speedtest"
"github.com/oneclickvirt/ecs/unlocktest"
"github.com/oneclickvirt/ecs/upstreams"
"github.com/oneclickvirt/ecs/internal/tests"
"github.com/oneclickvirt/ecs/utils"
"github.com/oneclickvirt/pingtest/pt"
"github.com/oneclickvirt/portchecker/email"
@@ -36,7 +30,7 @@ func RunChineseTests(preCheck utils.NetCheckResult, config *params.Config, wg1,
wg1.Add(1)
go func() {
defer wg1.Done()
*mediaInfo = unlocktest.MediaTest(config.Language)
*mediaInfo = tests.MediaTest(config.Language)
}()
}
if config.EmailTestStatus && preCheck.Connected && preCheck.StackType != "" && preCheck.StackType != "None" {
@@ -81,7 +75,7 @@ func RunEnglishTests(preCheck utils.NetCheckResult, config *params.Config, wg1,
wg1.Add(1)
go func() {
defer wg1.Done()
*mediaInfo = unlocktest.MediaTest(config.Language)
*mediaInfo = tests.MediaTest(config.Language)
}()
}
if config.EmailTestStatus {
@@ -106,7 +100,7 @@ func RunIpInfoCheck(config *params.Config, output, tempOutput string, outputMute
defer outputMutex.Unlock()
return utils.PrintAndCapture(func() {
var ipinfo string
upstreams.IPV4, upstreams.IPV6, ipinfo = utils.OnlyBasicsIpInfo(config.Language)
tests.IPV4, tests.IPV6, ipinfo = utils.OnlyBasicsIpInfo(config.Language)
if ipinfo != "" {
if config.Language == "zh" {
utils.PrintCenteredTitle("IP信息", config.Width)
@@ -133,13 +127,13 @@ func RunBasicTests(preCheck utils.NetCheckResult, config *params.Config, basicIn
}
}
if preCheck.Connected && preCheck.StackType == "DualStack" {
upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, config.Nt3CheckType, config.SecurityTestStatus)
tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, config.Nt3CheckType, config.SecurityTestStatus)
} else if preCheck.Connected && preCheck.StackType == "IPv4" {
upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv4", config.SecurityTestStatus)
tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv4", config.SecurityTestStatus)
} else if preCheck.Connected && preCheck.StackType == "IPv6" {
upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv6", config.SecurityTestStatus)
tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "ipv6", config.SecurityTestStatus)
} else {
upstreams.IPV4, upstreams.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "", false)
tests.IPV4, tests.IPV6, *basicInfo, *securityInfo, config.Nt3CheckType = utils.BasicsAndSecurityCheck(config.Language, "", false)
config.SecurityTestStatus = false
}
if config.BasicStatus {
@@ -163,7 +157,7 @@ func RunCPUTest(config *params.Config, output, tempOutput string, outputMutex *s
defer outputMutex.Unlock()
return utils.PrintAndCapture(func() {
if config.CpuTestStatus {
realTestMethod, res := cputest.CpuTest(config.Language, config.CpuTestMethod, config.CpuTestThreadMode)
realTestMethod, res := tests.CpuTest(config.Language, config.CpuTestMethod, config.CpuTestThreadMode)
if config.Language == "zh" {
utils.PrintCenteredTitle(fmt.Sprintf("CPU测试-通过%s测试", realTestMethod), config.Width)
} else {
@@ -180,7 +174,7 @@ func RunMemoryTest(config *params.Config, output, tempOutput string, outputMutex
defer outputMutex.Unlock()
return utils.PrintAndCapture(func() {
if config.MemoryTestStatus {
realTestMethod, res := memorytest.MemoryTest(config.Language, config.MemoryTestMethod)
realTestMethod, res := tests.MemoryTest(config.Language, config.MemoryTestMethod)
if config.Language == "zh" {
utils.PrintCenteredTitle(fmt.Sprintf("内存测试-通过%s测试", realTestMethod), config.Width)
} else {
@@ -197,7 +191,7 @@ func RunDiskTest(config *params.Config, output, tempOutput string, outputMutex *
defer outputMutex.Unlock()
return utils.PrintAndCapture(func() {
if config.DiskTestStatus && config.AutoChangeDiskMethod {
realTestMethod, res := disktest.DiskTest(config.Language, config.DiskTestMethod, config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
realTestMethod, res := tests.DiskTest(config.Language, config.DiskTestMethod, config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
if config.Language == "zh" {
utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", realTestMethod), config.Width)
} else {
@@ -207,17 +201,17 @@ func RunDiskTest(config *params.Config, output, tempOutput string, outputMutex *
} else if config.DiskTestStatus && !config.AutoChangeDiskMethod {
if config.Language == "zh" {
utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", "dd"), config.Width)
_, res := disktest.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
_, res := tests.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
fmt.Print(res)
utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", "fio"), config.Width)
_, res = disktest.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
_, res = tests.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
fmt.Print(res)
} else {
utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", "dd"), config.Width)
_, res := disktest.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
_, res := tests.DiskTest(config.Language, "dd", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
fmt.Print(res)
utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", "fio"), config.Width)
_, res = disktest.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
_, res = tests.DiskTest(config.Language, "fio", config.DiskTestPath, config.DiskMultiCheck, config.AutoChangeDiskMethod)
fmt.Print(res)
}
}
@@ -287,11 +281,11 @@ func RunNetworkTests(config *params.Config, wg3 *sync.WaitGroup, ptInfo *string,
return utils.PrintAndCapture(func() {
if config.BacktraceStatus && !config.OnlyChinaTest {
utils.PrintCenteredTitle("上游及回程线路检测", config.Width)
upstreams.UpstreamsCheck()
tests.UpstreamsCheck()
}
if config.Nt3Status && !config.OnlyChinaTest {
utils.PrintCenteredTitle("三网回程路由检测", config.Width)
nexttrace.NextTrace3Check(config.Language, config.Nt3Location, config.Nt3CheckType)
tests.NextTrace3Check(config.Language, config.Nt3Location, config.Nt3CheckType)
}
if config.OnlyChinaTest && *ptInfo != "" {
wg3.Wait()
@@ -328,17 +322,17 @@ func RunSpeedTests(config *params.Config, output, tempOutput string, outputMutex
return utils.PrintAndCapture(func() {
if config.SpeedTestStatus {
utils.PrintCenteredTitle("就近节点测速", config.Width)
speedtest.ShowHead(config.Language)
tests.ShowHead(config.Language)
if config.Choice == "1" || !config.MenuMode {
speedtest.NearbySP()
speedtest.CustomSP("net", "global", 2, config.Language)
speedtest.CustomSP("net", "cu", config.SpNum, config.Language)
speedtest.CustomSP("net", "ct", config.SpNum, config.Language)
speedtest.CustomSP("net", "cmcc", config.SpNum, config.Language)
tests.NearbySP()
tests.CustomSP("net", "global", 2, config.Language)
tests.CustomSP("net", "cu", config.SpNum, config.Language)
tests.CustomSP("net", "ct", config.SpNum, config.Language)
tests.CustomSP("net", "cmcc", config.SpNum, config.Language)
} else if config.Choice == "2" || config.Choice == "3" || config.Choice == "4" || config.Choice == "5" {
speedtest.CustomSP("net", "global", 4, config.Language)
tests.CustomSP("net", "global", 4, config.Language)
} else if config.Choice == "6" {
speedtest.CustomSP("net", "global", 11, config.Language)
tests.CustomSP("net", "global", 11, config.Language)
}
}
}, tempOutput, output)
@@ -368,9 +362,9 @@ func RunEnglishSpeedTests(config *params.Config, output, tempOutput string, outp
return utils.PrintAndCapture(func() {
if config.SpeedTestStatus {
utils.PrintCenteredTitle("Speed-Test", config.Width)
speedtest.ShowHead(config.Language)
speedtest.NearbySP()
speedtest.CustomSP("net", "global", -1, config.Language)
tests.ShowHead(config.Language)
tests.NearbySP()
tests.CustomSP("net", "global", -1, config.Language)
}
}, tempOutput, output)
}

2
cputest/cputest.go → internal/tests/cpu.go
View File

@@ -1,4 +1,4 @@
package cputest
package tests
import (
"runtime"

2
disktest/disktest.go → internal/tests/disk.go
View File

@@ -1,4 +1,4 @@
package disktest
package tests
import (
"runtime"

2
memorytest/memorytest.go → internal/tests/memory.go
View File

@@ -1,4 +1,4 @@
package memorytest
package tests
import (
"runtime"

2
nexttrace/nexttrace.go → internal/tests/nexttrace.go
View File

@@ -1,4 +1,4 @@
package nexttrace
package tests
import (
"fmt"

7
speedtest/sp.go → internal/tests/speed.go
View File

@@ -1,10 +1,11 @@
package speedtest
package tests
import (
"github.com/oneclickvirt/speedtest/model"
"github.com/oneclickvirt/speedtest/sp"
"runtime"
"strings"
"github.com/oneclickvirt/speedtest/model"
"github.com/oneclickvirt/speedtest/sp"
)
func ShowHead(language string) {

4
unlocktest/media.go → internal/tests/unlock.go
View File

@@ -1,8 +1,8 @@
package unlocktest
package tests
import (
"github.com/oneclickvirt/UnlockTests/utils"
"github.com/oneclickvirt/UnlockTests/executor"
"github.com/oneclickvirt/UnlockTests/utils"
"github.com/oneclickvirt/defaultset"
)

2
upstreams/upstreams.go → internal/tests/upstreams.go
View File

@@ -1,4 +1,4 @@
package upstreams
package tests
import (
"fmt"

11
memorytest/memorytest_test.go
View File

@@ -1,11 +0,0 @@
package memorytest
import (
"fmt"
"testing"
)
func Test(t *testing.T) {
_, res := MemoryTest("zh", "stream")
fmt.Print(res)
}

13
nexttrace/nexttrace_test.go
View File

@@ -1,13 +0,0 @@
package nexttrace
import (
"testing"
"time"
)
func TestNextTrace3Check(t *testing.T) {
start := time.Now()
NextTrace3Check("zh", "ALL", "ipv4")
duration := time.Since(start)
t.Logf("执行耗时: %s", duration)
}

8
speedtest/sp_test.go
View File

@@ -1,8 +0,0 @@
package speedtest
import "testing"
func Test(t *testing.T) {
ShowHead("en")
NearbySP()
}

10
unlocktest/media_test.go
View File

@@ -1,10 +0,0 @@
package unlocktest
import (
"fmt"
"testing"
)
func Test(t *testing.T) {
fmt.Printf("%s", MediaTest("zh"))
}

8
upstreams/uptreams_test.go
View File

@@ -1,8 +0,0 @@
package upstreams
import "testing"
func TestUpstreamsCheck(t *testing.T) {
IPV4 = "148.100.85.25"
UpstreamsCheck()
}