Merge pull request #96 from aykhans/refactor/general

💄 General refactoring

config/cli.go

@@ -27,7 +27,7 @@ Usage with all flags:
     -u https://example.com -m POST \
     -d 10 -r 1000 -t 3s \
     -b "body1" -body "body2" \
-    -H "header1: value1" -header "header2: value2" \
+    -H "header1:value1" -header "header2:value2" \
     -p "param1=value1" -param "param2=value2" \
     -c "cookie1=value1" -cookie "cookie2=value2" \
     -x "http://proxy.example.com:8080" -proxy "socks5://proxy2.example.com:8080" \

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/net v0.36.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/term v0.29.0 // indirect
 	golang.org/x/text v0.22.0 // indirect

go.sum

@@ -21,8 +21,8 @@ github.com/valyala/fasthttp v1.59.0 h1:Qu0qYHfXvPk1mSLNqcFtEk6DpxgA26hy6bmydotDp
 github.com/valyala/fasthttp v1.59.0/go.mod h1:GTxNb9Bc6r2a9D0TWNSPwDz78UxnTGBViY3xZNEqyYU=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=

types/cookies.go

@@ -21,7 +21,7 @@ func (cookies Cookies) String() string {
 
 	displayLimit := 3
 
-	for i, item := range cookies {
+	for i, item := range cookies[:min(len(cookies), displayLimit)] {
 		if i > 0 {
 			buffer.WriteString(",\n")
 		}
@@ -96,18 +96,18 @@ func (cookies *Cookies) Set(value string) error {
 	return nil
 }
 
-func (cookies *Cookies) AppendByKey(key string, value string) {
-	if existingValue := cookies.GetValue(key); existingValue != nil {
-		*cookies = append(*cookies, KeyValue[string, []string]{Key: key, Value: append(existingValue, value)})
+func (cookies *Cookies) AppendByKey(key, value string) {
+	if item := cookies.GetValue(key); item != nil {
+		*item = append(*item, value)
 	} else {
 		*cookies = append(*cookies, KeyValue[string, []string]{Key: key, Value: []string{value}})
 	}
 }
 
-func (cookies *Cookies) GetValue(key string) []string {
-	for _, cookie := range *cookies {
-		if cookie.Key == key {
-			return cookie.Value
+func (cookies Cookies) GetValue(key string) *[]string {
+	for i := range cookies {
+		if cookies[i].Key == key {
+			return &cookies[i].Value
 		}
 	}
 	return nil

types/headers.go

@@ -21,7 +21,7 @@ func (headers Headers) String() string {
 
 	displayLimit := 3
 
-	for i, item := range headers {
+	for i, item := range headers[:min(len(headers), displayLimit)] {
 		if i > 0 {
 			buffer.WriteString(",\n")
 		}
@@ -96,18 +96,18 @@ func (headers *Headers) Set(value string) error {
 	return nil
 }
 
-func (headers *Headers) AppendByKey(key string, value string) {
-	if existingValue := headers.GetValue(key); existingValue != nil {
-		*headers = append(*headers, KeyValue[string, []string]{Key: key, Value: append(existingValue, value)})
+func (headers *Headers) AppendByKey(key, value string) {
+	if item := headers.GetValue(key); item != nil {
+		*item = append(*item, value)
 	} else {
 		*headers = append(*headers, KeyValue[string, []string]{Key: key, Value: []string{value}})
 	}
 }
 
-func (headers *Headers) GetValue(key string) []string {
-	for _, header := range *headers {
-		if header.Key == key {
-			return header.Value
+func (headers Headers) GetValue(key string) *[]string {
+	for i := range headers {
+		if headers[i].Key == key {
+			return &headers[i].Value
 		}
 	}
 	return nil

types/params.go

@@ -21,7 +21,7 @@ func (params Params) String() string {
 
 	displayLimit := 3
 
-	for i, item := range params {
+	for i, item := range params[:min(len(params), displayLimit)] {
 		if i > 0 {
 			buffer.WriteString(",\n")
 		}
@@ -96,18 +96,18 @@ func (params *Params) Set(value string) error {
 	return nil
 }
 
-func (params *Params) AppendByKey(key string, value string) {
-	if existingValue := params.GetValue(key); existingValue != nil {
-		*params = append(*params, KeyValue[string, []string]{Key: key, Value: append(existingValue, value)})
+func (params *Params) AppendByKey(key, value string) {
+	if item := params.GetValue(key); item != nil {
+		*item = append(*item, value)
 	} else {
 		*params = append(*params, KeyValue[string, []string]{Key: key, Value: []string{value}})
 	}
 }
 
-func (params *Params) GetValue(key string) []string {
-	for _, param := range *params {
-		if param.Key == key {
-			return param.Value
+func (params Params) GetValue(key string) *[]string {
+	for i := range params {
+		if params[i].Key == key {
+			return &params[i].Value
 		}
 	}
 	return nil