Merge pull request #104 from aykhans/chore/refactor-ci

aykhans · web-flow · commit bea2a81afa68 · 2025-04-03T05:05:50.000+04:00
🔧 Refactor .golangci and Taskfile
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64
+          version: v2.0.2
           args: --timeout=10m --config=.golangci.yml
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,16 +1,16 @@
+version: "2"
+
 run:
     go: "1.24"
     concurrency: 8
     timeout: 10m
 
 linters:
-    disable-all: true
+    default: none
     enable:
         - asasalint
         - asciicheck
         - errcheck
-        - gofmt
-        - goimports
         - gomodguard
         - goprintffuncname
         - govet
@@ -21,7 +21,13 @@ linters:
         - prealloc
         - reassign
         - staticcheck
-        - typecheck
         - unconvert
         - unused
         - whitespace
+
+    settings:
+        staticcheck:
+            checks:
+                - "all"
+                - "-S1002"
+                - "-ST1000"
diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -20,25 +20,26 @@ vars:
 tasks:
     run: go run main.go
 
+    fmt: gofmt -w -d .
+
     lint: golangci-lint run
 
     build: go build -ldflags "-s -w" -o "dodo"
 
-    fmt: gofmt -w -d .
-
     build-all:
         silent: true
         cmds:
             - rm -rf binaries
-            - for: { var: PLATFORMS, as: PLATFORM }
-              cmd: |
-                  {{ $ext := "" }}
-
-                  {{ if eq $.PLATFORM.os "windows" }}
-                      {{ $ext = ".exe" }}
-                  {{ end }}
-
-                  {{range $arch := $.PLATFORM.archs}}
-                    echo "Building for {{$.PLATFORM.os}}/{{$arch}}"
-                    GOOS={{$.PLATFORM.os}} GOARCH={{$arch}} go build -ldflags "-s -w" -o "./binaries/dodo-{{$.PLATFORM.os}}-{{$arch}}{{$ext}}"
-                  {{end}}
+            - |
+                {{ $ext := "" }}
+                {{- range $platform := .PLATFORMS }}
+                    {{- if eq $platform.os "windows" }}
+                        {{ $ext = ".exe" }}
+                    {{- end }}
+
+                    {{- range $arch := $platform.archs }}
+                        echo "Building for {{$platform.os}}/{{$arch}}"
+                        GOOS={{$platform.os}} GOARCH={{$arch}} go build -ldflags "-s -w" -o "./binaries/dodo-{{$platform.os}}-{{$arch}}{{$ext}}"
+                    {{- end }}
+                {{- end }}
+            - echo -e "\033[32m*** Build completed ***\033[0m"
diff --git a/config/config.go b/config/config.go
@@ -145,45 +145,45 @@ func NewConfig() *Config {
 	return &Config{}
 }
 
-func (c *Config) Validate() []error {
+func (config *Config) Validate() []error {
 	var errs []error
-	if utils.IsNilOrZero(c.URL) {
+	if utils.IsNilOrZero(config.URL) {
 		errs = append(errs, errors.New("request URL is required"))
 	} else {
-		if c.URL.Scheme == "" {
-			c.URL.Scheme = "http"
+		if config.URL.Scheme == "" {
+			config.URL.Scheme = "http"
 		}
-		if c.URL.Scheme != "http" && c.URL.Scheme != "https" {
+		if config.URL.Scheme != "http" && config.URL.Scheme != "https" {
 			errs = append(errs, errors.New("request URL scheme must be http or https"))
 		}
 
 		urlParams := types.Params{}
-		for key, values := range c.URL.Query() {
+		for key, values := range config.URL.Query() {
 			for _, value := range values {
 				urlParams = append(urlParams, types.KeyValue[string, []string]{
 					Key:   key,
 					Value: []string{value},
 				})
 			}
 		}
-		c.Params = append(urlParams, c.Params...)
-		c.URL.RawQuery = ""
+		config.Params = append(urlParams, config.Params...)
+		config.URL.RawQuery = ""
 	}
 
-	if utils.IsNilOrZero(c.Method) {
+	if utils.IsNilOrZero(config.Method) {
 		errs = append(errs, errors.New("request method is required"))
 	}
-	if utils.IsNilOrZero(c.Timeout) {
+	if utils.IsNilOrZero(config.Timeout) {
 		errs = append(errs, errors.New("request timeout must be greater than 0"))
 	}
-	if utils.IsNilOrZero(c.DodosCount) {
+	if utils.IsNilOrZero(config.DodosCount) {
 		errs = append(errs, errors.New("dodos count must be greater than 0"))
 	}
-	if utils.IsNilOrZero(c.Duration) && utils.IsNilOrZero(c.RequestCount) {
+	if utils.IsNilOrZero(config.Duration) && utils.IsNilOrZero(config.RequestCount) {
 		errs = append(errs, errors.New("you should provide at least one of duration or request count"))
 	}
 
-	for i, proxy := range c.Proxies {
+	for i, proxy := range config.Proxies {
 		if proxy.String() == "" {
 			errs = append(errs, fmt.Errorf("proxies[%d]: proxy cannot be empty", i))
 		} else if schema := proxy.Scheme; !slices.Contains(SupportedProxySchemes, schema) {
diff --git a/config/file.go b/config/file.go
@@ -34,7 +34,7 @@ func (config *Config) ReadFile(filePath types.ConfigFile) error {
 			if err != nil {
 				return fmt.Errorf("failed to fetch config file from %s", filePath)
 			}
-			defer resp.Body.Close()
+			defer func() { _ = resp.Body.Close() }()
 
 			data, err = io.ReadAll(io.Reader(resp.Body))
 			if err != nil {
@@ -47,9 +47,10 @@ func (config *Config) ReadFile(filePath types.ConfigFile) error {
 			}
 		}
 
-		if fileExt == "json" {
+		switch fileExt {
+		case "json":
 			return parseJSONConfig(data, config)
-		} else if fileExt == "yml" || fileExt == "yaml" {
+		case "yml", "yaml":
 			return parseYAMLConfig(data, config)
 		}
 	}
diff --git a/requests/client.go b/requests/client.go
@@ -72,11 +72,12 @@ func getClients(
 func getDialFunc(proxy *url.URL, timeout time.Duration) (fasthttp.DialFunc, error) {
 	var dialer fasthttp.DialFunc
 
-	if proxy.Scheme == "socks5" || proxy.Scheme == "socks5h" {
+	switch proxy.Scheme {
+	case "socks5", "socks5h":
 		dialer = fasthttpproxy.FasthttpSocksDialerDualStack(proxy.String())
-	} else if proxy.Scheme == "http" {
+	case "http":
 		dialer = fasthttpproxy.FasthttpHTTPDialerDualStackTimeout(proxy.String(), timeout)
-	} else {
+	default:
 		return nil, errors.New("unsupported proxy scheme")
 	}
 	return dialer, nil
diff --git a/requests/run.go b/requests/run.go
@@ -65,9 +65,9 @@ func releaseDodos(
 		wg                  sync.WaitGroup
 		streamWG            sync.WaitGroup
 		requestCountPerDodo uint
-		dodosCount          uint = requestConfig.GetValidDodosCountForRequests()
-		responses                = make([][]*Response, dodosCount)
-		increase                 = make(chan int64, requestConfig.RequestCount)
+		dodosCount          = requestConfig.GetValidDodosCountForRequests()
+		responses           = make([][]*Response, dodosCount)
+		increase            = make(chan int64, requestConfig.RequestCount)
 	)
 
 	wg.Add(int(dodosCount))
diff --git a/types/body.go b/types/body.go
@@ -13,12 +13,12 @@ type Body []string
 func (body Body) String() string {
 	var buffer bytes.Buffer
 	if len(body) == 0 {
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	if len(body) == 1 {
 		buffer.WriteString(body[0])
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	buffer.WriteString(text.FgBlue.Sprint("Random") + "[\n")
@@ -41,7 +41,7 @@ func (body Body) String() string {
 	}
 
 	buffer.WriteString("\n]")
-	return string(buffer.Bytes())
+	return buffer.String()
 }
 
 func (body *Body) UnmarshalJSON(b []byte) error {
diff --git a/types/cookies.go b/types/cookies.go
@@ -14,7 +14,7 @@ type Cookies []KeyValue[string, []string]
 func (cookies Cookies) String() string {
 	var buffer bytes.Buffer
 	if len(cookies) == 0 {
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	indent := "  "
@@ -53,7 +53,7 @@ func (cookies Cookies) String() string {
 		buffer.WriteString(",\n" + text.FgGreen.Sprintf("+%d cookies", remainingPairs))
 	}
 
-	return string(buffer.Bytes())
+	return buffer.String()
 }
 
 func (cookies *Cookies) AppendByKey(key, value string) {
diff --git a/types/duration.go b/types/duration.go
@@ -32,7 +32,7 @@ func (duration *Duration) UnmarshalJSON(b []byte) error {
 }
 
 func (duration Duration) MarshalJSON() ([]byte, error) {
-	return json.Marshal(duration.Duration.String())
+	return json.Marshal(duration.String())
 }
 
 func (duration *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
diff --git a/types/headers.go b/types/headers.go
@@ -14,7 +14,7 @@ type Headers []KeyValue[string, []string]
 func (headers Headers) String() string {
 	var buffer bytes.Buffer
 	if len(headers) == 0 {
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	indent := "  "
@@ -53,7 +53,7 @@ func (headers Headers) String() string {
 		buffer.WriteString(",\n" + text.FgGreen.Sprintf("+%d headers", remainingPairs))
 	}
 
-	return string(buffer.Bytes())
+	return buffer.String()
 }
 
 func (headers *Headers) AppendByKey(key, value string) {
diff --git a/types/params.go b/types/params.go
@@ -14,7 +14,7 @@ type Params []KeyValue[string, []string]
 func (params Params) String() string {
 	var buffer bytes.Buffer
 	if len(params) == 0 {
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	indent := "  "
@@ -53,7 +53,7 @@ func (params Params) String() string {
 		buffer.WriteString(",\n" + text.FgGreen.Sprintf("+%d params", remainingPairs))
 	}
 
-	return string(buffer.Bytes())
+	return buffer.String()
 }
 
 func (params *Params) AppendByKey(key, value string) {
diff --git a/types/proxies.go b/types/proxies.go
@@ -14,12 +14,12 @@ type Proxies []url.URL
 func (proxies Proxies) String() string {
 	var buffer bytes.Buffer
 	if len(proxies) == 0 {
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	if len(proxies) == 1 {
 		buffer.WriteString(proxies[0].String())
-		return string(buffer.Bytes())
+		return buffer.String()
 	}
 
 	buffer.WriteString(text.FgBlue.Sprint("Random") + "[\n")
@@ -42,7 +42,7 @@ func (proxies Proxies) String() string {
 	}
 
 	buffer.WriteString("\n]")
-	return string(buffer.Bytes())
+	return buffer.String()
 }
 
 func (proxies *Proxies) UnmarshalJSON(b []byte) error {
diff --git a/types/request_url.go b/types/request_url.go
@@ -18,7 +18,7 @@ func (requestURL *RequestURL) UnmarshalJSON(data []byte) error {
 
 	parsedURL, err := url.Parse(urlStr)
 	if err != nil {
-		return errors.New("Request URL is invalid")
+		return errors.New("request URL is invalid")
 	}
 
 	requestURL.URL = *parsedURL
@@ -33,7 +33,7 @@ func (requestURL *RequestURL) UnmarshalYAML(unmarshal func(interface{}) error) e
 
 	parsedURL, err := url.Parse(urlStr)
 	if err != nil {
-		return errors.New("Request URL is invalid")
+		return errors.New("request URL is invalid")
 	}
 
 	requestURL.URL = *parsedURL
diff --git a/types/timeout.go b/types/timeout.go
@@ -32,7 +32,7 @@ func (timeout *Timeout) UnmarshalJSON(b []byte) error {
 }
 
 func (timeout Timeout) MarshalJSON() ([]byte, error) {
-	return json.Marshal(timeout.Duration.String())
+	return json.Marshal(timeout.String())
 }
 
 func (timeout *Timeout) UnmarshalYAML(unmarshal func(interface{}) error) error {
diff --git a/utils/compare.go b/utils/compare.go
@@ -6,9 +6,5 @@ func IsNilOrZero[T comparable](value *T) bool {
 	}
 
 	var zero T
-	if *value == zero {
-		return true
-	}
-
-	return false
+	return *value == zero
 }
diff --git a/utils/slice.go b/utils/slice.go
@@ -20,9 +20,9 @@ func Flatten[T any](nested [][]*T) []*T {
 // The returned function isn't thread-safe and should be used in a single-threaded context.
 func RandomValueCycle[Value any](values []Value, localRand *rand.Rand) func() Value {
 	var (
-		clientsCount int = len(values)
-		currentIndex int = localRand.Intn(clientsCount)
-		stopIndex    int = currentIndex
+		clientsCount = len(values)
+		currentIndex = localRand.Intn(clientsCount)
+		stopIndex    = currentIndex
 	)
 
 	return func() Value {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (config *Config) ReadFile(filePath types.ConfigFile) error {`
`34`	`34`	`if err != nil {`
`35`	`35`	`return fmt.Errorf("failed to fetch config file from %s", filePath)`
`36`	`36`	`}`
`37`		`- defer resp.Body.Close()`
	`37`	`+ defer func() { _ = resp.Body.Close() }()`
`38`	`38`
`39`	`39`	`data, err = io.ReadAll(io.Reader(resp.Body))`
`40`	`40`	`if err != nil {`
`@@ -47,9 +47,10 @@ func (config *Config) ReadFile(filePath types.ConfigFile) error {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- if fileExt == "json" {`
	`50`	`+ switch fileExt {`
	`51`	`+ case "json":`
`51`	`52`	`return parseJSONConfig(data, config)`
`52`		`- } else if fileExt == "yml" \|\| fileExt == "yaml" {`
	`53`	`+ case "yml", "yaml":`
`53`	`54`	`return parseYAMLConfig(data, config)`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ type Body []string`
`13`	`13`	`func (body Body) String() string {`
`14`	`14`	`var buffer bytes.Buffer`
`15`	`15`	`if len(body) == 0 {`
`16`		`- return string(buffer.Bytes())`
	`16`	`+ return buffer.String()`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`if len(body) == 1 {`
`20`	`20`	`buffer.WriteString(body[0])`
`21`		`- return string(buffer.Bytes())`
	`21`	`+ return buffer.String()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`buffer.WriteString(text.FgBlue.Sprint("Random") + "[\n")`
`@@ -41,7 +41,7 @@ func (body Body) String() string {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`buffer.WriteString("\n]")`
`44`		`- return string(buffer.Bytes())`
	`44`	`+ return buffer.String()`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func (body *Body) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type Cookies []KeyValue[string, []string]`
`14`	`14`	`func (cookies Cookies) String() string {`
`15`	`15`	`var buffer bytes.Buffer`
`16`	`16`	`if len(cookies) == 0 {`
`17`		`- return string(buffer.Bytes())`
	`17`	`+ return buffer.String()`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`indent := " "`
`@@ -53,7 +53,7 @@ func (cookies Cookies) String() string {`
`53`	`53`	`buffer.WriteString(",\n" + text.FgGreen.Sprintf("+%d cookies", remainingPairs))`
`54`	`54`	`}`
`55`	`55`
`56`		`- return string(buffer.Bytes())`
	`56`	`+ return buffer.String()`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func (cookies *Cookies) AppendByKey(key, value string) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (duration *Duration) UnmarshalJSON(b []byte) error {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func (duration Duration) MarshalJSON() ([]byte, error) {`
`35`		`- return json.Marshal(duration.Duration.String())`
	`35`	`+ return json.Marshal(duration.String())`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func (duration *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {`