config/config.go

@@ -90,12 +90,12 @@ func (config *RequestConfig) GetMaxConns(minConns uint) uint {
 }
 
 type Config struct {
-	Method       string              `json:"method" validate:"http_method"` // custom validations: http_method
-	URL          string              `json:"url" validate:"http_url,required"`
-	Timeout      uint32              `json:"timeout" validate:"gte=1,lte=100000"`
-	DodosCount   uint                `json:"dodos_count" validate:"gte=1"`
-	RequestCount uint                `json:"request_count" validation_name:"request-count" validate:"gte=1"`
-	NoProxyCheck utils.IOption[bool] `json:"no_proxy_check"`
+	Method       string             `json:"method" validate:"http_method"` // custom validations: http_method
+	URL          string             `json:"url" validate:"http_url,required"`
+	Timeout      uint32             `json:"timeout" validate:"gte=1,lte=100000"`
+	DodosCount   uint               `json:"dodos_count" validate:"gte=1"`
+	RequestCount uint               `json:"request_count" validation_name:"request-count" validate:"gte=1"`
+	NoProxyCheck utils.Option[bool] `json:"no_proxy_check"`
 }
 
 func (config *Config) MergeConfigs(newConfig *Config) {

readers/cli.go

@@ -12,8 +12,8 @@ import (
 
 func CLIConfigReader() (*config.CLIConfig, error) {
 	var (
-		returnNil = false
-		cliConfig = &config.CLIConfig{
+		returnNil    = false
+		cliConfig    = &config.CLIConfig{
 			Config: config.Config{
 				NoProxyCheck: utils.NewNoneOption[bool](),
 			},

requests/client.go

@@ -47,15 +47,15 @@ func getClients(
 				}
 
 				clients = append(clients, &fasthttp.HostClient{
-					MaxConns:            int(maxConns),
-					IsTLS:               isTLS,
-					Addr:                addr,
-					Dial:                dialFunc,
-					MaxIdleConnDuration: timeout,
-					MaxConnDuration:     timeout,
-					WriteTimeout:        timeout,
-					ReadTimeout:         timeout,
-				},
+						MaxConns:            int(maxConns),
+						IsTLS:               isTLS,
+						Addr:                addr,
+						Dial:                dialFunc,
+						MaxIdleConnDuration: timeout,
+						MaxConnDuration:     timeout,
+						WriteTimeout:        timeout,
+						ReadTimeout:         timeout,
+					},
 				)
 			}
 			return clients

utils/types.go

@@ -5,32 +5,20 @@ import (
 	"errors"
 )
 
-type NonNilConcrete interface {
-    ~int | ~float64 | ~string | ~bool
-}
-
-type IOption[T NonNilConcrete] interface {
-	IsNone() bool
-	ValueOrErr() (*T, error)
-	ValueOr(def *T) *T
-	ValueOrPanic() *T
-	UnmarshalJSON(data []byte) error
-}
-
 // Don't call this struct directly, use NewOption[T] or NewNoneOption[T] instead.
-type option[T NonNilConcrete] struct {
+type Option[T any] struct {
 	// value holds the actual value of the Option if it is not None.
 	value T
 	// none indicates whether the Option is None (i.e., has no value).
 	none bool
 }
 
-func (o *option[T]) IsNone() bool {
+func (o *Option[T]) IsNone() bool {
 	return o.none
 }
 
 // The returned value can be nil, if the Option is None, it will return nil and an error.
-func (o *option[T]) ValueOrErr() (*T, error) {
+func (o *Option[T]) ValueOrErr() (*T, error) {
 	if o.IsNone() {
 		return nil, errors.New("Option is None")
 	}
@@ -38,7 +26,7 @@ func (o *option[T]) ValueOrErr() (*T, error) {
 }
 
 // The returned value can't be nil, if the Option is None, it will return the default value.
-func (o *option[T]) ValueOr(def *T) *T {
+func (o *Option[T]) ValueOr(def *T) *T {
 	if o.IsNone() {
 		return def
 	}
@@ -46,14 +34,14 @@ func (o *option[T]) ValueOr(def *T) *T {
 }
 
 // The returned value can't be nil, if the Option is None, it will panic.
-func (o *option[T]) ValueOrPanic() *T {
+func (o *Option[T]) ValueOrPanic() *T {
 	if o.IsNone() {
 		panic("Option is None")
 	}
 	return &o.value
 }
 
-func (o *option[T]) UnmarshalJSON(data []byte) error {
+func (o *Option[T]) UnmarshalJSON(data []byte) error {
 	if string(data) == "null" {
 		o.none = true
 		return nil
@@ -62,10 +50,10 @@ func (o *option[T]) UnmarshalJSON(data []byte) error {
 	return json.Unmarshal(data, &o.value)
 }
 
-func NewOption[T NonNilConcrete](value T) *option[T] {
-	return &option[T]{value: value}
+func NewOption[T any](value T) Option[T] {
+	return Option[T]{value: value}
 }
 
-func NewNoneOption[T NonNilConcrete]() *option[T] {
-	return &option[T]{none: true}
+func NewNoneOption[T any]() Option[T] {
+	return Option[T]{none: true}
 }