update

README.md

@@ -6,6 +6,10 @@
 
 Shell版本： https://github.com/spiritLHLS/ecs
 
+## 语言
+
+[中文文档](README.md) | [English Docs](README_EN.md)
+
 ## 适配系统和架构
 
 已支持的架构: x86_64、i386、arm64
@@ -34,6 +38,20 @@ Shell版本： https://github.com/spiritLHLS/ecs
 
 ## Linux上使用的说明
 
+### 一键命令
+
+```
+curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+```
+
+或
+
+```
+curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+```
+
+### 详细说明
+
 下载脚本
 
 ```

README_EN.md

@@ -0,0 +1,177 @@
+# ECS
+
+[![release](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml/badge.svg)](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml) [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Foneclickvirt%2Fecs&count_bg=%2357DEFF&title_bg=%23000000&icon=cliqz.svg&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://www.spiritlhl.net/)
+
+Fusion Monster Evaluation Script - GO Refactored Version - Since it has not been officially released, please report any issues via issues.
+
+Shell version: https://github.com/spiritLHLS/ecs/blob/main/README_EN.md
+
+## Language
+
+[中文文档](README.md) | [English Docs](README_EN.md)
+
+## Supported Systems and Architectures
+
+Supported architectures: x86_64, i386, arm64
+
+Pending support (due to unsupported dependencies): s390x
+
+Supported systems: Linux, Windows
+
+Pending support (due to unresolved hardware testing bugs): MacOS
+
+## Features
+
+- [x] System basic information query [Self-developed [basics](https://github.com/oneclickvirt/basics), [gostun](https://github.com/oneclickvirt/gostun)]
+- [x] Concurrent IP basic information query [Self-developed [basics](https://github.com/oneclickvirt/basics)]
+- [x] CPU test [Self-developed [cputest](https://github.com/oneclickvirt/cputest) supporting sysbench, geekbench, winsat]
+- [x] Memory test [Self-developed [memorytest](https://github.com/oneclickvirt/memorytest) supporting sysbench, dd]
+- [x] Disk test [Self-developed [disktest](https://github.com/oneclickvirt/disktest) supporting dd, fio, winsat]
+- [x] Concurrent streaming media unlock information query for three major platforms [Modified from [netflix-verify](https://github.com/sjlleo/netflix-verify), [VerifyDisneyPlus](https://github.com/sjlleo/VerifyDisneyPlus), [TubeCheck](https://github.com/sjlleo/TubeCheck) to [CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests)]
+- [x] Concurrent common streaming media tests [Self-developed code, logic modified from [RegionRestrictionCheck](https://github.com/lmc999/RegionRestrictionCheck), [MediaUnlockTest](https://github.com/HsukqiLee/MediaUnlockTest) to [UnlockTests](https://github.com/oneclickvirt/UnlockTests)]
+- [x] Concurrent IP quality/security information query [Self-developed, due to testing with key information, privately developed, but binary files compiled in [securityCheck](https://github.com/oneclickvirt/securityCheck)]
+- [x] Email port test [Self-developed [portchecker](https://github.com/oneclickvirt/portchecker)]
+- [x] Three-network return path test [Modified from [zhanghanyun/backtrace](https://github.com/zhanghanyun/backtrace) to [oneclickvirt/backtrace](https://github.com/oneclickvirt/backtrace)]
+- [x] Three-network route test [Modified from [NTrace-core](https://github.com/nxtrace/NTrace-core) to [nt3](https://github.com/oneclickvirt/nt3)]
+- [x] Speed test [Based on data from [speedtest.net-crawler](https://github.com/spiritLHLS/speedtest.net-CN-ID), [speedtest.cn-crawler](https://github.com/spiritLHLS/speedtest.cn-CN-ID), modified from [speedtest-go](https://github.com/showwin/speedtest-go) to [oneclickvirt/speedtest](https://github.com/oneclickvirt/speedtest)]
+- [x] Three-network Ping test [Modified from [ecsspeed](https://github.com/spiritLHLS/ecsspeed) logic to [pingtest](https://github.com/oneclickvirt/pingtest)]
+
+## Instructions for Use on Linux
+
+### one-click command
+
+```
+curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+```
+
+### explain in detail
+
+Download the script
+
+```
+curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
+```
+
+Install environment
+
+```
+./goecs.sh env
+```
+
+Install goecs
+
+```
+./goecs.sh install
+```
+
+Upgrade goecs
+
+```
+./goecs.sh upgrade
+```
+
+Uninstall goecs
+
+```
+./goecs.sh delete
+```
+
+Explanation of the shell script
+
+```
+Available commands:
+
+./goecs.sh env             Check and Install package:
+                                sudo (Almost all unix-like systems have it.)
+                                tar (Almost all unix-like systems have it.)
+                                unzip (Almost all unix-like systems have it.)
+                                dd (Almost all unix-like systems have it.)
+                                fio (Almost all unix-like systems can be installed through the system's package manager.)
+                                sysbench (Almost all unix-like systems can be installed through the system's package manager.)
+                                geekbench (geekbench5)(Only support IPV4 environment, and memory greater than 1GB network detection, only support amd64 and arm64 architecture.)
+                                speedtest (Use the officially provided binaries for more accurate test results.)
+                                ping (Use the officially provided binaries for more accurate test results.)
+                           In fact, sysbench/geekbench is the only one of the above dependencies that must be installed, without which the CPU score cannot be tested.
+./goecs.sh install         Install goecs command
+./goecs.sh upgrade         Upgrade goecs command
+./goecs.sh delete          Uninstall goecs command
+./goecs.sh help            Show this message
+```
+
+Invoke the goecs menu
+
+```
+goecs
+```
+
+or
+
+```
+./goecs
+```
+
+Parameterized goecs command
+
+```
+Usage: goecs [options]
+  -backtrace
+        Enable/Disable backtrace test (in 'en' language or on windows it always false) (default true)
+  -basic
+        Enable/Disable basic test (default true)
+  -comm
+        Enable/Disable common media test (default true)
+  -cpu
+        Enable/Disable CPU test (default true)
+  -cpum string
+        Set CPU test method (supported: sysbench, geekbench, winsat) (default "sysbench")
+  -cput string
+        Set CPU test thread mode (supported: single, multi) (default "multi")
+  -disk
+        Enable/Disable disk test (default true)
+  -diskm string
+        Set disk test method (supported: fio, dd, winsat) (default "fio")
+  -diskmc
+        Enable/Disable multiple disk checks, e.g., -diskmc=false
+  -diskp string
+        Set disk test path, e.g., -diskp /root
+  -email
+        Enable/Disable email port test (default true)
+  -h    Show help information
+  -l string
+        Set language (supported: en, zh) (default "zh")
+  -log
+        Enable/Disable logging in the current path
+  -memory
+        Enable/Disable memory test (default true)
+  -memorym string
+        Set memory test method (supported: sysbench, dd, winsat) (default "dd")
+  -menu
+        Enable/Disable menu mode, disable example: -menu=false (default true)
+  -nt3
+        Enable/Disable NT3 test (in 'en' language or on windows it always false) (default true)
+  -nt3loc string
+        Specify NT3 test location (supported: GZ, SH, BJ, CD for Guangzhou, Shanghai, Beijing, Chengdu) (default "GZ")
+  -nt3t string
+        Set NT3 test type (supported: both, ipv4, ipv6) (default "ipv4")
+  -security
+        Enable/Disable security test (default true)
+  -speed
+        Enable/Disable speed test (default true)
+  -spnum int
+        Set the number of servers per operator for speed test (default 2)
+  -ut
+        Enable/Disable unlock media test (default true)
+  -v    Display version information
+```
+
+## Instructions for Use on Windows
+
+Download the compressed file with the exe file
+
+https://github.com/oneclickvirt/ecs/releases
+
+Find the latest version, download the .tar.gz file corresponding to your architecture, and unzip it to get an exe file.
+
+Right-click the exe file and select Run as administrator (running without administrator mode will not allow hardware testing), and invoke the menu to choose.
+
+No environment installation is required for Windows testing.

go.mod

@@ -4,7 +4,7 @@ go 1.22.4
 
 require (
 	github.com/imroc/req/v3 v3.43.7
-	github.com/oneclickvirt/CommonMediaTests v0.0.3-20240702073302
+	github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502
 	github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930
 	github.com/oneclickvirt/backtrace v0.0.4-20240702140722
 	github.com/oneclickvirt/basics v0.0.5-20240702055351
@@ -17,7 +17,7 @@ require (
 	github.com/oneclickvirt/pingtest v0.0.4-20240703142340
 	github.com/oneclickvirt/portchecker v0.0.1-20240624155429
 	github.com/oneclickvirt/security v0.0.4-20240702055848
-	github.com/oneclickvirt/speedtest v0.0.6-20240702134926
+	github.com/oneclickvirt/speedtest v0.0.7-20240704023701
 )
 
 require (

go.sum

@@ -75,8 +75,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/nxtrace/NTrace-core v1.3.1 h1:f4z5UaZEuhUP/g6xElpZ2bo+guWITJVrMKrJTqd27oc=
 github.com/nxtrace/NTrace-core v1.3.1/go.mod h1:0Px/Zc60qk6cssmP+yv4kstFxvX9sXqDduoVqBO+qf8=
-github.com/oneclickvirt/CommonMediaTests v0.0.3-20240702073302 h1:JbgWWVL6WR44H/dqpBLdet0M7lM/YrnwGEG40FmawRo=
-github.com/oneclickvirt/CommonMediaTests v0.0.3-20240702073302/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
+github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 h1:hRIYJ2uEp2N3AH5bP5X6bwfdwWfZQO/2WoqpUJ8+WsY=
+github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
 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-20240702140722 h1:UJ/VWf+ZbhGarc9HcHMIyenpmX+b2LxkXu0hlLk3Gxs=
@@ -101,8 +101,8 @@ github.com/oneclickvirt/portchecker v0.0.1-20240624155429 h1:+wapaOcFrg1iWJDhBKT
 github.com/oneclickvirt/portchecker v0.0.1-20240624155429/go.mod h1:HQxSTrqM8/QFqHMTBZ7S8H9eEO5FkUXU1eb7ZX5Mk+k=
 github.com/oneclickvirt/security v0.0.4-20240702055848 h1:UCfjfoslcfKhCvJm37jQmhJ+O8d4lL+uvBJVcLAXc2s=
 github.com/oneclickvirt/security v0.0.4-20240702055848/go.mod h1:YKmO3FRWjhHYJ5rKqz+1H3hB6sCA4gioik7r8GMfyqo=
-github.com/oneclickvirt/speedtest v0.0.6-20240702134926 h1:1aF6O9iFZGD7iabb9BB3O8MDL9/guuXJlRdsfJMs+dI=
-github.com/oneclickvirt/speedtest v0.0.6-20240702134926/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
+github.com/oneclickvirt/speedtest v0.0.7-20240704023701 h1:F8ChZXf3U1/bUk+dCFt0Gc01LSPLhbBhCeHjkEJ6K88=
+github.com/oneclickvirt/speedtest v0.0.7-20240704023701/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
 github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=

goecs.go

@@ -36,7 +36,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.33"
+	ecsVersion                                                        = "v0.0.36"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -357,12 +357,12 @@ func main() {
 				speedtest.ShowHead(language)
 				if (menuMode && choice == "1") || !menuMode {
 					speedtest.NearbySP()
-					speedtest.CustomSP("net", "global", 2)
-					speedtest.CustomSP("net", "cu", spNum)
-					speedtest.CustomSP("net", "ct", spNum)
-					speedtest.CustomSP("net", "cmcc", spNum)
+					speedtest.CustomSP("net", "global", 2, language)
+					speedtest.CustomSP("net", "cu", spNum, language)
+					speedtest.CustomSP("net", "ct", spNum, language)
+					speedtest.CustomSP("net", "cmcc", spNum, language)
 				} else if menuMode && choice == "2" || choice == "3" || choice == "4" || choice == "5" {
-					speedtest.CustomSP("net", "global", 4)
+					speedtest.CustomSP("net", "global", 4, language)
 				}
 			}
 		}, tempOutput, output)
@@ -382,7 +382,7 @@ func main() {
 			utils.PrintHead(language, width, ecsVersion)
 			if basicStatus || securityTestStatus {
 				if basicStatus {
-					utils.PrintCenteredTitle("System Basic Information", width)
+					utils.PrintCenteredTitle("System-Basic-Information", width)
 				}
 				basicInfo, securityInfo, nt3CheckType = utils.SecurityCheck(language, nt3CheckType, securityTestStatus)
 				if basicStatus {
@@ -392,63 +392,64 @@ func main() {
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if cpuTestStatus {
-				utils.PrintCenteredTitle(fmt.Sprintf("CPU Test - %s Method", cpuTestMethod), width)
+				utils.PrintCenteredTitle(fmt.Sprintf("CPU-Test--%s-Method", cpuTestMethod), width)
 				cputest.CpuTest(language, cpuTestMethod, cpuTestThreadMode)
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if memoryTestStatus {
-				utils.PrintCenteredTitle(fmt.Sprintf("Memory Test - %s Method", memoryTestMethod), width)
+				utils.PrintCenteredTitle(fmt.Sprintf("Memory-Test--%s-Method", memoryTestMethod), width)
 				memorytest.MemoryTest(language, memoryTestMethod)
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if diskTestStatus {
-				utils.PrintCenteredTitle(fmt.Sprintf("Disk Test - %s Method", diskTestMethod), width)
+				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", diskTestMethod), width)
 				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
 			}
 		}, tempOutput, output)
-		if emailTestStatus {
+		if utTestStatus {
 			wg1.Add(1)
 			go func() {
 				defer wg1.Done()
+				mediaInfo = unlocktest.MediaTest(language)
+			}()
+		}
+		if emailTestStatus {
+			wg2.Add(1)
+			go func() {
+				defer wg2.Done()
 				emailInfo = email.EmailCheck()
 			}()
 		}
-		output = utils.PrintAndCapture(func() {
-			if commTestStatus {
-				utils.PrintCenteredTitle("The Three Main Streaming Media Unlock", width)
-				commediatest.ComMediaTest(language)
-			}
-		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if utTestStatus {
-				utils.PrintCenteredTitle("Cross-Border Streaming Media Unlock", width)
-				unlocktest.MediaTest(language)
+				utils.PrintCenteredTitle("Cross-Border-Streaming-Media-Unlock", width)
+				wg1.Wait()
+				fmt.Printf(mediaInfo)
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if securityTestStatus {
-				utils.PrintCenteredTitle("IP Quality Check", width)
+				utils.PrintCenteredTitle("IP-Quality-Check", width)
 				fmt.Printf(securityInfo)
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if emailTestStatus {
-				utils.PrintCenteredTitle("Email Port Check", width)
-				wg1.Wait()
+				utils.PrintCenteredTitle("Email-Port-Check", width)
+				wg2.Wait()
 				fmt.Println(emailInfo)
 			}
 		}, tempOutput, output)
 		output = utils.PrintAndCapture(func() {
 			if speedTestStatus {
-				utils.PrintCenteredTitle("Nearby Node Speed Test", width)
+				utils.PrintCenteredTitle("Speed-Test", width)
 				speedtest.ShowHead(language)
 				speedtest.NearbySP()
-				speedtest.CustomSP("net", "global", -1)
+				speedtest.CustomSP("net", "global", -1, language)
 			}
 		}, tempOutput, output)
-
 		endTime := time.Now()
 		duration := endTime.Sub(startTime)
 		minutes := int(duration.Minutes())
@@ -456,7 +457,7 @@ func main() {
 		currentTime := time.Now().Format("Mon Jan 2 15:04:05 MST 2006")
 		output = utils.PrintAndCapture(func() {
 			utils.PrintCenteredTitle("", width)
-			fmt.Printf("Cost    Time          : %d 分 %d 秒\n", minutes, seconds)
+			fmt.Printf("Cost    Time          : %d min %d sec\n", minutes, seconds)
 			fmt.Printf("Current Time          : %s\n", currentTime)
 			utils.PrintCenteredTitle("", width)
 		}, tempOutput, output)

goecs.sh

@@ -61,7 +61,7 @@ goecs_check() {
     # 检测原始goecs命令是否存在，若存在则升级，不存在则安装
     version_output=$(goecs -v command 2>/dev/null || ./goecs -v command 2>/dev/null)
     if [ $? -eq 0 ]; then
-        extracted_version=$(echo "${version_output//v/}")
+        extracted_version=${version_output//v/}
         if [ -n "$extracted_version" ]; then
             ecs_version=$ECS_VERSION
             if [[ "$(echo -e "$extracted_version\n$ecs_version" | sort -V | tail -n 1)" == "$extracted_version" ]]; then
@@ -233,8 +233,23 @@ env_check() {
     PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add")
     PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm" "pkg delete" "apk del")
     PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "" "pkg autoremove" "apk autoremove")
-    CMD=("$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(hostnamectl 2>/dev/null | grep -i system | cut -d : -f2)" "$(lsb_release -sd 2>/dev/null)" "$(grep -i description /etc/lsb-release 2>/dev/null | cut -d \" -f2)" "$(grep . /etc/redhat-release 2>/dev/null)" "$(grep . /etc/issue 2>/dev/null | cut -d \\ -f1 | sed '/^[ ]*$/d')" "$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(uname -s)" "$(uname -s)")
-    SYS="${CMD[0]}"
+    if [ -s /etc/os-release ]; then
+      SYS="$(grep -i pretty_name /etc/os-release | cut -d \" -f2)"
+    elif [ -x "$(type -p hostnamectl)" ]; then
+      SYS="$(hostnamectl | grep -i system | cut -d : -f2)"
+    elif [ -x "$(type -p lsb_release)" ]; then
+      SYS="$(lsb_release -sd)"
+    elif [ -s /etc/lsb-release ]; then
+      SYS="$(grep -i description /etc/lsb-release | cut -d \" -f2)"
+    elif [ -s /etc/redhat-release ]; then
+      SYS="$(grep . /etc/redhat-release)"
+    elif [ -s /etc/issue ]; then
+      SYS="$(grep . /etc/issue | cut -d '\' -f1 | sed '/^[ ]*$/d')"
+    elif [ -f /etc/alpine-release ]; then
+      SYS="alpine"
+    else
+      SYS="$(uname -s)}"
+    fi
     [[ -n $SYS ]] || exit 1
     for ((int = 0; int < ${#REGEX[@]}; int++)); do
         if [[ $(echo "$SYS" | tr '[:upper:]' '[:lower:]') =~ ${REGEX[int]} ]]; then
@@ -320,11 +335,13 @@ env_check() {
         fi
     fi
     _green "The environment is ready."
+    _green "The next command is: ./goecs.sh install"
 }
 
 delete_goecs() {
   rm -rf /root/goecs
   rm -rf /usr/bin/goecs
+  _green "The command (goecs) has been deleted."
 }
 
 show_help() {

speedtest/sp.go

@@ -19,7 +19,7 @@ func NearbySP() {
 	}
 }
 
-func CustomSP(platform, operator string, num int) {
+func CustomSP(platform, operator string, num int, language string) {
 	var url, parseType string
 	if strings.ToLower(platform) == "cn" {
 		if strings.ToLower(operator) == "cmcc" {
@@ -59,8 +59,8 @@ func CustomSP(platform, operator string, num int) {
 		parseType = "id"
 	}
 	if runtime.GOOS == "windows" || sp.OfficialAvailableTest() != nil {
-		sp.CustomSpeedTest(url, parseType, num)
+		sp.CustomSpeedTest(url, parseType, num, language)
 	} else {
-		sp.OfficialCustomSpeedTest(url, parseType, num)
+		sp.OfficialCustomSpeedTest(url, parseType, num, language)
 	}
 }