Merge pull request #65 from aykhans/refactor/rename-cli-flags

🔨 Rename CLI flags
🔖 bump version to 0.5.502
2025-07-01 16:07:49 +00:00 · 2025-01-03 13:27:24 +04:00 · 2025-01-03 13:26:34 +04:00 · 2025-01-03 13:26:00 +04:00 · 2025-01-03 13:17:20 +04:00 · 2025-01-03 13:14:25 +04:00
13 changed files with 284 additions and 154 deletions
--- a/README.md
+++ b/README.md
@ -60,12 +60,12 @@ You can find an example config structure in the [config.json](https://github.com
    "url": "https://example.com",
    "no_proxy_check": false,
    "timeout": 2000,
-    "dodos_count": 10,
-    "request_count": 1000,
+    "dodos": 10,
+    "requests": 1000,
    "params": {},
    "headers": {},
    "cookies": {},
-    "body": [""],
+    "body": [],
    "proxies": [
        {
            "url": "http://example.com:8080",
@ -108,8 +108,8 @@ If the Headers, Params, Cookies and Body fields have multiple values, each reque
 | Yes                   | -                | --yes           | -y             | Boolean                          | Answer yes to all questions                                         | false       |
 | URL                   | url              | --url           | -u             | String                           | URL to send the request to                                          | -           |
 | Method                | method           | --method        | -m             | String                           | HTTP method                                                         | GET         |
-| Request count         | request_count    | --request-count | -r             | Integer                          | Total number of requests to send                                    | 1000        |
-| Dodos count (Threads) | dodos_count      | --dodos-count   | -d             | Integer                          | Number of dodos (threads) to send requests in parallel              | 1           |
+| Requests              | requests         | --requests      | -r             | Integer                          | Total number of requests to send                                    | 1000        |
+| Dodos (Threads)       | dodos            | --dodos         | -d             | Integer                          | Number of dodos (threads) to send requests in parallel              | 1           |
 | Timeout               | timeout          | --timeout       | -t             | Integer                          | Timeout for canceling each request (milliseconds)                   | 10000       |
 | No Proxy Check        | no_proxy_check   | --no-proxy-check| -              | Boolean                          | Disable proxy check                                                 | false       |
 | Params                | params           | -               | -              | Key-Value {String: [String]}     | Request parameters                                                  | -           |
--- a/config.json
+++ b/config.json
@ -3,12 +3,12 @@
    "url": "https://example.com",
    "no_proxy_check": false,
    "timeout": 10000,
-    "dodos_count": 50,
-    "request_count": 1000,
+    "dodos": 1,
+    "requests": 1,
    "params": {},
    "headers": {},
    "cookies": {},
-    "body": [""],
+    "body": [],
    "proxies": [
        {
            "url": "http://example.com:8080",
--- a/config/config.go
+++ b/config/config.go
@ -1,9 +1,9 @@
 package config

 import (
-	"fmt"
 	"net/url"
 	"os"
+	"strings"
 	"time"

 	. "github.com/aykhans/dodo/types"
@ -12,13 +12,13 @@ import (
 )

 const (
-	VERSION                 string = "0.5.3"
+	VERSION                 string = "0.5.502"
 	DefaultUserAgent        string = "Dodo/" + VERSION
 	ProxyCheckURL           string = "https://www.google.com"
 	DefaultMethod           string = "GET"
 	DefaultTimeout          uint32 = 10000 // Milliseconds (10 seconds)
 	DefaultDodosCount       uint   = 1
-	DefaultRequestCount     uint   = 1000
+	DefaultRequestCount     uint   = 1
 	MaxDodosCountForProxies uint   = 20 // Max dodos count for proxy check
 )

@ -42,7 +42,18 @@ func (config *RequestConfig) Print() {
 	t.SetOutputMirror(os.Stdout)
 	t.SetStyle(table.StyleLight)
 	t.SetColumnConfigs([]table.ColumnConfig{
-		{Number: 2, WidthMax: 50},
+		{
+			Number: 2,
+			WidthMaxEnforcer: func(col string, maxLen int) string {
+				lines := strings.Split(col, "\n")
+				for i, line := range lines {
+					if len(line) > maxLen {
+						lines[i] = line[:maxLen-3] + "..."
+					}
+				}
+				return strings.Join(lines, "\n")
+			},
+			WidthMax: 50},
 	})

 	newHeaders := make(map[string][]string)
@ -56,23 +67,23 @@ func (config *RequestConfig) Print() {
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"URL", config.URL})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Timeout", fmt.Sprintf("%dms", config.Timeout/time.Millisecond)})
+	t.AppendRow(table.Row{"Timeout", config.Timeout})
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Dodos", config.DodosCount})
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Requests", config.RequestCount})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Params", utils.MarshalJSON(config.Params, 3)})
+	t.AppendRow(table.Row{"Params", string(utils.PrettyJSONMarshal(config.Params, 3, "", "  "))})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Headers", utils.MarshalJSON(newHeaders, 3)})
+	t.AppendRow(table.Row{"Headers", string(utils.PrettyJSONMarshal(newHeaders, 3, "", "  "))})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Cookies", utils.MarshalJSON(config.Cookies, 3)})
+	t.AppendRow(table.Row{"Cookies", string(utils.PrettyJSONMarshal(config.Cookies, 3, "", "  "))})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Proxies Count", len(config.Proxies)})
+	t.AppendRow(table.Row{"Proxies", string(utils.PrettyJSONMarshal(config.Proxies, 3, "", "  "))})
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Proxy Check", !config.NoProxyCheck})
 	t.AppendSeparator()
-	t.AppendRow(table.Row{"Body", utils.MarshalJSON(config.Body, 3)})
+	t.AppendRow(table.Row{"Body", string(utils.PrettyJSONMarshal(config.Body, 3, "", "  "))})

 	t.Render()
 }
@ -96,8 +107,8 @@ 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"`
+	DodosCount   uint         `json:"dodos" validate:"gte=1"`
+	RequestCount uint         `json:"requests" validation_name:"request-count" validate:"gte=1"`
 	NoProxyCheck Option[bool] `json:"no_proxy_check"`
 }

@ -209,13 +220,13 @@ func (config *JSONConfig) MergeConfigs(newConfig *JSONConfig) {

 type CLIConfig struct {
 	*Config
-	Yes        bool   `json:"yes" validate:"omitempty"`
-	ConfigFile string `validation_name:"config-file" validate:"omitempty,filepath"`
+	Yes        Option[bool] `json:"yes" validate:"omitempty"`
+	ConfigFile string       `validation_name:"config-file" validate:"omitempty,filepath"`
 }

 func NewCLIConfig(
 	config *Config,
-	yes bool,
+	yes Option[bool],
 	configFile string,
 ) *CLIConfig {
 	return &CLIConfig{
@ -228,4 +239,7 @@ func (config *CLIConfig) MergeConfigs(newConfig *CLIConfig) {
 	if newConfig.ConfigFile != "" {
 		config.ConfigFile = newConfig.ConfigFile
 	}
+	if !newConfig.Yes.IsNone() {
+		config.Yes = newConfig.Yes
+	}
 }
--- a/custom_errors/formaters.go
+++ b/custom_errors/formaters.go
@ -19,10 +19,6 @@ func OSErrorFormater(err error) error {
 	return ErrInvalidFile
 }

-func CobraErrorFormater(err error) error {
-	return err
-}
-
 func shortenNamespace(namespace string) string {
 	return namespace[strings.Index(namespace, ".")+1:]
 }
--- a/go.mod
+++ b/go.mod
@ -5,10 +5,8 @@ go 1.23.2
 require (
 	github.com/go-playground/validator/v10 v10.23.0
 	github.com/jedib0t/go-pretty/v6 v6.6.5
-	github.com/spf13/cobra v1.8.1
-	github.com/spf13/pflag v1.0.5
 	github.com/valyala/fasthttp v1.58.0
-	golang.org/x/net v0.32.0
+	golang.org/x/net v0.33.0
 )

 require (
@ -16,7 +14,6 @@ require (
 	github.com/gabriel-vasile/mimetype v1.4.4 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
--- a/go.sum
+++ b/go.sum
@ -1,6 +1,5 @@
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
 github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
@ -13,8 +12,6 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
 github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3NgSqAo=
 github.com/jedib0t/go-pretty/v6 v6.6.5/go.mod h1:Uq/HrbhuFty5WSVNfjpQQe47x16RwVGXIveNGEyGtHs=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
@ -28,11 +25,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@ -43,14 +35,13 @@ github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZ
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/main.go
+++ b/main.go
@ -27,9 +27,13 @@ func main() {
 	)

 	cliConf, err := readers.CLIConfigReader()
-	if err != nil || cliConf == nil {
+	if err != nil {
+		utils.PrintAndExit(err.Error())
+	}
+	if cliConf == nil {
 		os.Exit(0)
 	}
+
 	if err := validator.StructPartial(cliConf, "ConfigFile"); err != nil {
 		utils.PrintErrAndExit(
 			customerrors.ValidationErrorsFormater(
@ -82,11 +86,11 @@ func main() {
 		Cookies:      jsonConf.Cookies,
 		Proxies:      jsonConf.Proxies,
 		Body:         jsonConf.Body,
-		Yes:          cliConf.Yes,
-		NoProxyCheck: conf.NoProxyCheck.ValueOrPanic(),
+		Yes:          cliConf.Yes.ValueOr(false),
+		NoProxyCheck: conf.NoProxyCheck.ValueOr(false),
 	}
 	requestConf.Print()
-	if !cliConf.Yes {
+	if !cliConf.Yes.ValueOr(false) {
 		response := readers.CLIYesOrNoReader("Do you want to continue?", true)
 		if !response {
 			utils.PrintAndExit("Exiting...")
--- a/readers/cli.go
+++ b/readers/cli.go
@ -1,70 +1,128 @@
 package readers

 import (
+	"flag"
 	"fmt"
+	"strings"

 	"github.com/aykhans/dodo/config"
-	"github.com/aykhans/dodo/custom_errors"
 	. "github.com/aykhans/dodo/types"
 	"github.com/aykhans/dodo/utils"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 )

+const usageText = `Usage:
+  dodo [flags]
+
+Examples:
+
+Simple usage only with URL:
+  dodo -u https://example.com
+
+Simple usage with config file:
+  dodo -c /path/to/config/file/config.json
+
+Usage with all flags:
+  dodo -c /path/to/config/file/config.json -u https://example.com -m POST -d 10 -r 1000 -t 2000 --no-proxy-check -y
+
+Flags:
+  -h, --help                 help for dodo
+  -v, --version              version for dodo
+  -c, --config-file string   Path to the config file
+  -d, --dodos uint           Number of dodos(threads) (default %d)
+  -m, --method string        HTTP Method (default %s)
+  -r, --request uint         Number of total requests (default %d)
+  -t, --timeout uint32       Timeout for each request in milliseconds (default %d)
+  -u, --url string           URL for stress testing
+      --no-proxy-check bool  Do not check for proxies (default false)
+  -y, --yes bool             Answer yes to all questions (default false)`
+
 func CLIConfigReader() (*config.CLIConfig, error) {
-	var (
-		returnNil    = false
-		cliConfig    = config.NewCLIConfig(config.NewConfig("", 0, 0, 0, nil), false, "")
-		dodosCount   uint
-		requestCount uint
-		timeout      uint32
-		noProxyCheck bool
-		rootCmd      = &cobra.Command{
-			Use: "dodo [flags]",
-			Example: `  Simple usage only with URL:
-    dodo -u https://example.com
-
-  Simple usage with config file:
-    dodo -c /path/to/config/file/config.json
-
-  Usage with all flags:
-    dodo -c /path/to/config/file/config.json -u https://example.com -m POST -d 10 -r 1000 -t 2000 --no-proxy-check -y`,
-			Run:           func(cmd *cobra.Command, args []string) {},
-			SilenceErrors: true,
-			SilenceUsage:  true,
-			Version:       config.VERSION,
-		}
-	)
-
-	rootCmd.Flags().StringVarP(&cliConfig.ConfigFile, "config-file", "c", "", "Path to the config file")
-	rootCmd.Flags().BoolVarP(&cliConfig.Yes, "yes", "y", false, "Answer yes to all questions")
-	rootCmd.Flags().StringVarP(&cliConfig.Method, "method", "m", "", fmt.Sprintf("HTTP Method (default %s)", config.DefaultMethod))
-	rootCmd.Flags().StringVarP(&cliConfig.URL, "url", "u", "", "URL for stress testing")
-	rootCmd.Flags().UintVarP(&dodosCount, "dodos-count", "d", config.DefaultDodosCount, "Number of dodos(threads)")
-	rootCmd.Flags().UintVarP(&requestCount, "request-count", "r", config.DefaultRequestCount, "Number of total requests")
-	rootCmd.Flags().Uint32VarP(&timeout, "timeout", "t", config.DefaultTimeout, "Timeout for each request in milliseconds")
-	rootCmd.Flags().BoolVar(&noProxyCheck, "no-proxy-check", false, "Do not check for proxies")
-	if err := rootCmd.Execute(); err != nil {
-		utils.PrintErr(err)
-		rootCmd.Println(rootCmd.UsageString())
-		return nil, customerrors.CobraErrorFormater(err)
+	flag.Usage = func() {
+		fmt.Printf(
+			usageText+"\n",
+			config.DefaultDodosCount,
+			config.DefaultMethod,
+			config.DefaultRequestCount,
+			config.DefaultTimeout,
+		)
 	}
-	rootCmd.Flags().Visit(func(f *pflag.Flag) {
+
+	var (
+		cliConfig          = config.NewCLIConfig(config.NewConfig("", 0, 0, 0, nil), NewOption(false), "")
+		configFile         = ""
+		yes                = false
+		method             = ""
+		url                = ""
+		dodosCount    uint = 0
+		requestsCount uint = 0
+		timeout       uint = 0
+		noProxyCheck  bool = false
+	)
+	{
+		flag.Bool("version", false, "Prints the version of the program")
+		flag.Bool("v", false, "Prints the version of the program")
+
+		flag.StringVar(&configFile, "config-file", "", "Path to the configuration file")
+		flag.StringVar(&configFile, "c", "", "Path to the configuration file")
+
+		flag.BoolVar(&yes, "yes", false, "Answer yes to all questions")
+		flag.BoolVar(&yes, "y", false, "Answer yes to all questions")
+
+		flag.StringVar(&method, "method", "", "HTTP Method")
+		flag.StringVar(&method, "m", "", "HTTP Method")
+
+		flag.StringVar(&url, "url", "", "URL to send the request")
+		flag.StringVar(&url, "u", "", "URL to send the request")
+
+		flag.UintVar(&dodosCount, "dodos", 0, "Number of dodos(threads)")
+		flag.UintVar(&dodosCount, "d", 0, "Number of dodos(threads)")
+
+		flag.UintVar(&requestsCount, "requests", 0, "Number of total requests")
+		flag.UintVar(&requestsCount, "r", 0, "Number of total requests")
+
+		flag.UintVar(&timeout, "timeout", 0, "Timeout for each request in milliseconds")
+		flag.UintVar(&timeout, "t", 0, "Timeout for each request in milliseconds")
+
+		flag.BoolVar(&noProxyCheck, "no-proxy-check", false, "Do not check for active proxies")
+	}
+
+	flag.Parse()
+
+	args := flag.Args()
+	if len(args) > 0 {
+		return nil, fmt.Errorf("unexpected arguments: %v", strings.Join(args, ", "))
+	}
+
+	returnNil := false
+	flag.Visit(func(f *flag.Flag) {
 		switch f.Name {
-		case "help":
+		case "version", "v":
+			fmt.Printf("dodo version %s\n", config.VERSION)
 			returnNil = true
-		case "version":
-			returnNil = true
-		case "dodos-count":
+		case "config-file", "c":
+			cliConfig.ConfigFile = configFile
+		case "yes", "y":
+			cliConfig.Yes.SetValue(yes)
+		case "method", "m":
+			cliConfig.Method = method
+		case "url", "u":
+			cliConfig.URL = url
+		case "dodos", "d":
 			cliConfig.DodosCount = dodosCount
-		case "request-count":
-			cliConfig.RequestCount = requestCount
-		case "timeout":
-			cliConfig.Timeout = timeout
+		case "requests", "r":
+			cliConfig.RequestCount = requestsCount
+		case "timeout", "t":
+			var maxUint32 uint = 4294967295
+			if timeout > maxUint32 {
+				utils.PrintfC(utils.Colors.Yellow, "timeout value is too large, setting to %d\n", maxUint32)
+				timeout = maxUint32
+			}
+			cliConfig.Timeout = uint32(timeout)
 		case "no-proxy-check":
-			cliConfig.NoProxyCheck = NewOption(noProxyCheck)
+			cliConfig.NoProxyCheck.SetValue(noProxyCheck)
 		}
 	})
+
 	if returnNil {
 		return nil, nil
 	}
--- a/requests/response.go
+++ b/requests/response.go
@ -5,6 +5,7 @@ import (
 	"time"

 	. "github.com/aykhans/dodo/types"
+	"github.com/aykhans/dodo/utils"
 	"github.com/jedib0t/go-pretty/v6/table"
 )

@ -17,7 +18,7 @@ type Responses []*Response

 // Print prints the responses in a tabular format, including information such as
 // response count, minimum time, maximum time, average time, and latency percentiles.
-func (respones Responses) Print() {
+func (responses Responses) Print() {
 	total := struct {
 		Count int
 		Min   time.Duration
@ -27,14 +28,14 @@ func (respones Responses) Print() {
 		P95   time.Duration
 		P99   time.Duration
 	}{
-		Count: len(respones),
-		Min:   respones[0].Time,
-		Max:   respones[0].Time,
+		Count: len(responses),
+		Min:   responses[0].Time,
+		Max:   responses[0].Time,
 	}
 	mergedResponses := make(map[string]Durations)
 	var allDurations Durations

-	for _, response := range respones {
+	for _, response := range responses {
 		if response.Time < total.Min {
 			total.Min = response.Time
 		}
@ -64,14 +65,15 @@ func (respones Responses) Print() {
 	t.AppendHeader(table.Row{
 		"Response",
 		"Count",
-		"Min Time",
-		"Max Time",
-		"Average Time",
+		"Min",
+		"Max",
+		"Average",
 		"P90",
 		"P95",
 		"P99",
 	})

+	var roundPrecision int64 = 4
 	for key, durations := range mergedResponses {
 		durations.Sort()
 		durationsLen := len(durations)
@ -80,12 +82,12 @@ func (respones Responses) Print() {
 		t.AppendRow(table.Row{
 			key,
 			durationsLen,
-			durations.First(),
-			durations.Last(),
-			durations.Avg(),
-			durations[int(0.90*durationsLenAsFloat)],
-			durations[int(0.95*durationsLenAsFloat)],
-			durations[int(0.99*durationsLenAsFloat)],
+			utils.DurationRoundBy(*durations.First(), roundPrecision),
+			utils.DurationRoundBy(*durations.Last(), roundPrecision),
+			utils.DurationRoundBy(durations.Avg(), roundPrecision),
+			utils.DurationRoundBy(durations[int(0.90*durationsLenAsFloat)], roundPrecision),
+			utils.DurationRoundBy(durations[int(0.95*durationsLenAsFloat)], roundPrecision),
+			utils.DurationRoundBy(durations[int(0.99*durationsLenAsFloat)], roundPrecision),
 		})
 		t.AppendSeparator()
 	}
@ -94,12 +96,12 @@ func (respones Responses) Print() {
 		t.AppendRow(table.Row{
 			"Total",
 			total.Count,
-			total.Min,
-			total.Max,
-			total.Sum / time.Duration(total.Count), // Average
-			total.P90,
-			total.P95,
-			total.P99,
+			utils.DurationRoundBy(total.Min, roundPrecision),
+			utils.DurationRoundBy(total.Max, roundPrecision),
+			utils.DurationRoundBy(total.Sum/time.Duration(total.Count), roundPrecision), // Average
+			utils.DurationRoundBy(total.P90, roundPrecision),
+			utils.DurationRoundBy(total.P95, roundPrecision),
+			utils.DurationRoundBy(total.P99, roundPrecision),
 		})
 	}
 	t.Render()
--- a/types/option.go
+++ b/types/option.go
@ -14,6 +14,8 @@ type Option[T NonNilT] interface {
 	ValueOrErr() (T, error)
 	ValueOr(def T) T
 	ValueOrPanic() T
+	SetValue(value T)
+	SetNone()
 	UnmarshalJSON(data []byte) error
 }

--- a/utils/convert.go
+++ b/utils/convert.go
@ -6,49 +6,80 @@ import (
 	"reflect"
 )

-func MarshalJSON(v any, maxSliceSize uint) string {
-	rv := reflect.ValueOf(v)
-	if rv.Kind() == reflect.Slice && rv.Len() == 0 {
-		return "[]"
-	}
-
-	data, err := json.MarshalIndent(truncateLists(v, int(maxSliceSize)), "", "  ")
-	if err != nil {
-		return "{}"
-	}
-
-	return string(data)
+type TruncatedMarshaller struct {
+	Value    interface{}
+	MaxItems int
 }

-func truncateLists(v interface{}, maxItems int) interface{} {
-	rv := reflect.ValueOf(v)
+func (t TruncatedMarshaller) MarshalJSON() ([]byte, error) {
+	val := reflect.ValueOf(t.Value)

-	switch rv.Kind() {
-	case reflect.Slice, reflect.Array:
-		if rv.Len() > maxItems {
-			newSlice := reflect.MakeSlice(rv.Type(), maxItems, maxItems)
-			reflect.Copy(newSlice, rv.Slice(0, maxItems))
-			newSlice = reflect.Append(newSlice, reflect.ValueOf(fmt.Sprintf("...(%d more)", rv.Len()-maxItems)))
-			return newSlice.Interface()
-		}
+	if val.Kind() != reflect.Slice && val.Kind() != reflect.Array {
+		return json.Marshal(t.Value)
+	}
+	if val.Len() == 0 {
+		return []byte("[]"), nil
+	}
+
+	length := val.Len()
+	if length <= t.MaxItems {
+		return json.Marshal(t.Value)
+	}
+
+	truncated := make([]interface{}, t.MaxItems+1)
+
+	for i := 0; i < t.MaxItems; i++ {
+		truncated[i] = val.Index(i).Interface()
+	}
+
+	remaining := length - t.MaxItems
+	truncated[t.MaxItems] = fmt.Sprintf("+%d", remaining)
+
+	return json.Marshal(truncated)
+}
+
+func PrettyJSONMarshal(v interface{}, maxItems int, prefix, indent string) []byte {
+	truncated := processValue(v, maxItems)
+	d, _ := json.MarshalIndent(truncated, prefix, indent)
+	return d
+}
+
+func processValue(v interface{}, maxItems int) interface{} {
+	val := reflect.ValueOf(v)
+
+	switch val.Kind() {
 	case reflect.Map:
-		newMap := reflect.MakeMap(rv.Type())
-		for _, key := range rv.MapKeys() {
-			newMap.SetMapIndex(key, reflect.ValueOf(truncateLists(rv.MapIndex(key).Interface(), maxItems)))
+		newMap := make(map[string]interface{})
+		iter := val.MapRange()
+		for iter.Next() {
+			k := iter.Key().String()
+			newMap[k] = processValue(iter.Value().Interface(), maxItems)
 		}
-		return newMap.Interface()
-	case reflect.Struct:
-		newStruct := reflect.New(rv.Type()).Elem()
-		for i := 0; i < rv.NumField(); i++ {
-			newStruct.Field(i).Set(reflect.ValueOf(truncateLists(rv.Field(i).Interface(), maxItems)))
-		}
-		return newStruct.Interface()
-	case reflect.Ptr:
-		if rv.IsNil() {
-			return nil
-		}
-		return truncateLists(rv.Elem().Interface(), maxItems)
-	}
+		return newMap

-	return v
+	case reflect.Slice, reflect.Array:
+		return TruncatedMarshaller{Value: v, MaxItems: maxItems}
+
+	case reflect.Struct:
+		newMap := make(map[string]interface{})
+		t := val.Type()
+		for i := 0; i < t.NumField(); i++ {
+			field := t.Field(i)
+			if field.IsExported() {
+				jsonTag := field.Tag.Get("json")
+				if jsonTag == "-" {
+					continue
+				}
+				fieldName := field.Name
+				if jsonTag != "" {
+					fieldName = jsonTag
+				}
+				newMap[fieldName] = processValue(val.Field(i).Interface(), maxItems)
+			}
+		}
+		return newMap
+
+	default:
+		return v
+	}
 }
--- a/utils/int.go
+++ b/utils/int.go
@ -0,0 +1,21 @@
+package utils
+
+type Number interface {
+	int | int8 | int16 | int32 | int64
+}
+
+func NumLen[T Number](n T) T {
+	if n < 0 {
+		n = -n
+	}
+	if n == 0 {
+		return 1
+	}
+
+	var count T = 0
+	for n > 0 {
+		n /= 10
+		count++
+	}
+	return count
+}
--- a/utils/time.go
+++ b/utils/time.go
@ -0,0 +1,14 @@
+package utils
+
+import "time"
+
+func DurationRoundBy(duration time.Duration, n int64) time.Duration {
+	if durationLen := NumLen(duration.Nanoseconds()); durationLen > n {
+		roundNum := 1
+		for range durationLen - n {
+			roundNum *= 10
+		}
+		return duration.Round(time.Duration(roundNum))
+	}
+	return duration
+}
Author	SHA1	Message	Date
Aykhan Shahsuvarov	779d5e9b18	Merge pull request #65 from aykhans/refactor/rename-cli-flags 🔨 Rename CLI flags	2025-01-03 13:27:24 +04:00
Aykhan Shahsuvarov	6a79d0b1d7	🔖 bump version to 0.5.502	2025-01-03 13:26:34 +04:00
Aykhan Shahsuvarov	1e53b8a7fb	📚 Update docs	2025-01-03 13:26:00 +04:00
Aykhan Shahsuvarov	0a8dbec739	🔨 Renama JSON parameters	2025-01-03 13:17:20 +04:00
Aykhan Shahsuvarov	3762890914	🔨 Rename CLI flags	2025-01-03 13:14:25 +04:00
Aykhan Shahsuvarov	ca6b3d4eb2	Merge pull request #64 from aykhans/bump/version 🔖 Bump version to 0.5.501	2024-12-25 02:08:59 +04:00
Aykhan Shahsuvarov	1ee06aacc3	🔖 Bump version to 0.5.501	2024-12-25 02:08:47 +04:00
Aykhan Shahsuvarov	3d5834a6a6	Merge pull request #63 from aykhans/fix/empty-slice 🐛 Return empty brackets instead of null when slice length is 0	2024-12-25 01:24:28 +04:00
Aykhan Shahsuvarov	f1521cbb74	💄 Update config table	2024-12-23 18:58:22 +04:00
Aykhan Shahsuvarov	40f8a1cc37	🐛 Return empty brackets instead of null when slice length is 0	2024-12-22 23:15:10 +04:00
Aykhan Shahsuvarov	8a3574cd48	Merge pull request #62 from aykhans/bumg/version 🔖 Bump version to v0.5.5	2024-12-22 22:03:09 +04:00
Aykhan Shahsuvarov	5a2a4c47b2	🔖 Bump version to v0.5.5	2024-12-22 22:02:57 +04:00
Aykhan Shahsuvarov	ff09a3365e	Merge pull request #61 from aykhans/dependabot/go_modules/golang.org/x/net-0.33.0 Bump golang.org/x/net from 0.32.0 to 0.33.0	2024-12-20 18:17:30 +04:00
Aykhan Shahsuvarov	c83246abe4	Merge pull request #60 from aykhans/refactor/json-marshal Refactor json marshal	2024-12-20 18:17:11 +04:00
Aykhan Shahsuvarov	efc4c62001	📚 Update docs	2024-12-20 18:16:25 +04:00
dependabot[bot]	f567774e3a	Bump golang.org/x/net from 0.32.0 to 0.33.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.32.0 to 0.33.0. - [Commits](https://github.com/golang/net/compare/v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-20 01:01:35 +00:00
Aykhan Shahsuvarov	d2bd60e3ff	🔨 Add custom 'WidthMaxEnforcer' to the table config	2024-12-20 01:21:26 +04:00
Aykhan Shahsuvarov	0fe782c768	🔨 Add 'PrettyJSONMarshal' function	2024-12-20 01:20:45 +04:00
Aykhan Shahsuvarov	b9dd14a588	Merge pull request #59 from aykhans/refactor/response-print 🔨 Round off durations before printing	2024-12-19 23:22:06 +04:00
Aykhan Shahsuvarov	18b1c7dae3	🔨 Round off durations before printing	2024-12-19 21:40:53 +04:00
Aykhan Shahsuvarov	77ddcf722a	Merge pull request #58 from aykhans/hotfix/maxuint 🚑 Replace 'math.MaxUint32' with static variable	2024-12-18 23:47:53 +04:00
Aykhan Shahsuvarov	048cb68898	🚑 Replace 'math.MaxUint32' with static variable	2024-12-18 23:47:24 +04:00
Aykhan Shahsuvarov	fd5e87ee68	Merge pull request #57 from aykhans/refactor/cli-readers 🔨 Cobra package replaced with standard flag package	2024-12-18 23:40:03 +04:00
Aykhan Shahsuvarov	61b9ce943b	📚 Update docs	2024-12-18 23:38:52 +04:00
Aykhan Shahsuvarov	6fceb0094b	🔖 Bump version to 0.5.4	2024-12-18 23:31:13 +04:00
Aykhan Shahsuvarov	186683fce5	🔨Cobra package replaced with standard flag package	2024-12-18 20:58:14 +04:00