Merge adc5a34891c0f86f226f6200472f0d05e587260d into 565079fe970f9bdcff3dd0310556377f226da91c

README.md

@@ -102,7 +102,7 @@ docker run --rm -v ./path/config.json:/dodo/config.json -i aykhans/dodo -u https
 If the Headers, Params, Cookies and Body fields have multiple values, each request will choose a random value from the list.
 
 | Parameter             | JSON config file | CLI Flag        | CLI Short Flag | Type                             | Description                                                         | Default     |
-| ----------- | ----------- | ----------- | ----------- | ----------- | ----------- | ----------- |
+| --------------------- | ---------------- | --------------- | -------------- | -------------------------------- | ------------------------------------------------------------------- | ----------- |
 | Config file           | -                | --config-file   | -c             | String                           | Path to the JSON config file                                        | -           |
 | Yes                   | -                | --yes           | -y             | Boolean                          | Answer yes to all questions                                         | false       |
 | URL                   | url              | --url           | -u             | String                           | URL to send the request to                                          | -           |
@@ -110,6 +110,7 @@ If the Headers, Params, Cookies and Body fields have multiple values, each reque
 | 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           |
 | 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                                                  | -           |
 | Headers               | headers          | -               | -              | Key-Value {String: [String]}     | Request headers                                                     | -           |
 | Cookies               | cookies          | -               | -              | Key-Value {String: [String]}     | Request cookies                                                     | -           |

config.json

@@ -1,6 +1,7 @@
 {
     "method": "GET",
     "url": "https://example.com",
+    "no_proxy_check": false,
     "timeout": 10000,
     "dodos_count": 50,
     "request_count": 1000,

config/config.go

@@ -37,6 +37,7 @@ type RequestConfig struct {
 	Proxies      []Proxy
 	Body         []string
 	Yes          bool
+	NoProxyCheck bool
 }
 
 func (config *RequestConfig) Print() {
@@ -66,6 +67,8 @@ func (config *RequestConfig) Print() {
 	t.AppendSeparator()
 	t.AppendRow(table.Row{"Proxies Count", len(config.Proxies)})
 	t.AppendSeparator()
+	t.AppendRow(table.Row{"Proxy Check", !config.NoProxyCheck})
+	t.AppendSeparator()
 	t.AppendRow(table.Row{"Body", utils.MarshalJSON(config.Body, 3)})
 
 	t.Render()
@@ -92,6 +95,7 @@ type Config struct {
 	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) {
@@ -110,6 +114,9 @@ func (config *Config) MergeConfigs(newConfig *Config) {
 	if newConfig.RequestCount != 0 {
 		config.RequestCount = newConfig.RequestCount
 	}
+	if !newConfig.NoProxyCheck.IsNone() {
+		config.NoProxyCheck = newConfig.NoProxyCheck
+	}
 }
 
 func (config *Config) SetDefaults() {
@@ -125,6 +132,9 @@ func (config *Config) SetDefaults() {
 	if config.RequestCount == 0 {
 		config.RequestCount = DefaultRequestCount
 	}
+	if config.NoProxyCheck.IsNone() {
+		config.NoProxyCheck = utils.NewOption(false)
+	}
 }
 
 type Proxy struct {

main.go

@@ -81,6 +81,7 @@ func main() {
 		Proxies:      jsonConf.Proxies,
 		Body:         jsonConf.Body,
 		Yes:          cliConf.Yes,
+		NoProxyCheck: *conf.NoProxyCheck.ValueOrPanic(),
 	}
 	requestConf.Print()
 	if !cliConf.Yes {

readers/cli.go

@@ -13,10 +13,15 @@ import (
 func CLIConfigReader() (*config.CLIConfig, error) {
 	var (
 		returnNil    = false
-		cliConfig    = &config.CLIConfig{}
+		cliConfig    = &config.CLIConfig{
+			Config: config.Config{
+				NoProxyCheck: utils.NewNoneOption[bool](),
+			},
+		}
 		dodosCount   uint
 		requestCount uint
 		timeout      uint32
+		noProxyCheck bool
 		rootCmd      = &cobra.Command{
 			Use: "dodo [flags]",
 			Example: `  Simple usage only with URL:
@@ -27,16 +32,6 @@ func CLIConfigReader() (*config.CLIConfig, error) {
 
   Usage with all flags:
     dodo -c /path/to/config/file/config.json -u https://example.com -m POST -d 10 -r 1000 -t 2000`,
-			Short: `
-██████████      ███████    ██████████      ███████   
-░░███░░░░███   ███░░░░░███ ░░███░░░░███   ███░░░░░███ 
- ░███   ░░███ ███     ░░███ ░███   ░░███ ███     ░░███
- ░███    ░███░███      ░███ ░███    ░███░███      ░███
- ░███    ░███░███      ░███ ░███    ░███░███      ░███
- ░███    ███ ░░███     ███  ░███    ███ ░░███     ███ 
- ██████████   ░░░███████░   ██████████   ░░░███████░  
-░░░░░░░░░░      ░░░░░░░    ░░░░░░░░░░      ░░░░░░░    
-`,
 			Run:           func(cmd *cobra.Command, args []string) {},
 			SilenceErrors: true,
 			SilenceUsage:  true,
@@ -51,6 +46,7 @@ func CLIConfigReader() (*config.CLIConfig, error) {
 	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())
@@ -68,6 +64,8 @@ func CLIConfigReader() (*config.CLIConfig, error) {
 			cliConfig.RequestCount = requestCount
 		case "timeout":
 			cliConfig.Timeout = timeout
+		case "no-proxy-check":
+			cliConfig.NoProxyCheck = utils.NewOption(noProxyCheck)
 		}
 	})
 	if returnNil {

readers/json.go

@@ -5,7 +5,8 @@ import (
 	"os"
 
 	"github.com/aykhans/dodo/config"
-	"github.com/aykhans/dodo/custom_errors"
+	customerrors "github.com/aykhans/dodo/custom_errors"
+	"github.com/aykhans/dodo/utils"
 )
 
 func JSONConfigReader(filePath string) (*config.JSONConfig, error) {
@@ -13,7 +14,11 @@ func JSONConfigReader(filePath string) (*config.JSONConfig, error) {
 	if err != nil {
 		return nil, customerrors.OSErrorFormater(err)
 	}
-	jsonConf := &config.JSONConfig{}
+	jsonConf := &config.JSONConfig{
+		Config: config.Config{
+			NoProxyCheck: utils.NewNoneOption[bool](),
+		},
+	}
 	err = json.Unmarshal(data, &jsonConf)
 
 	if err != nil {

requests/client.go

@@ -26,11 +26,42 @@ func getClients(
 	dodosCount uint,
 	maxConns uint,
 	yes bool,
+	noProxyCheck bool,
 	URL *url.URL,
 ) []*fasthttp.HostClient {
 	isTLS := URL.Scheme == "https"
 
-	if len(proxies) > 0 {
+	if proxiesLen := len(proxies); proxiesLen > 0 {
+		// If noProxyCheck is true, we will return the clients without checking the proxies.
+		if noProxyCheck {
+			clients := make([]*fasthttp.HostClient, 0, proxiesLen)
+			addr := URL.Host
+			if isTLS && URL.Port() == "" {
+				addr += ":443"
+			}
+
+			for _, proxy := range proxies {
+				dialFunc, err := getDialFunc(&proxy, timeout)
+				if err != nil {
+					continue
+				}
+
+				clients = append(clients, &fasthttp.HostClient{
+						MaxConns:            int(maxConns),
+						IsTLS:               isTLS,
+						Addr:                addr,
+						Dial:                dialFunc,
+						MaxIdleConnDuration: timeout,
+						MaxConnDuration:     timeout,
+						WriteTimeout:        timeout,
+						ReadTimeout:         timeout,
+					},
+				)
+			}
+			return clients
+		}
+
+		// Else, we will check the proxies and return the active ones.
 		activeProxyClients := getActiveProxyClients(
 			ctx, proxies, timeout, dodosCount, maxConns, URL,
 		)

requests/run.go

@@ -2,6 +2,7 @@ package requests
 
 import (
 	"context"
+	"fmt"
 	"sync"
 	"time"
 
@@ -24,6 +25,8 @@ import (
 //   - Responses: A collection of responses from the executed requests.
 //   - error: An error if the operation fails, such as no internet connection or an interrupt.
 func Run(ctx context.Context, requestConfig *config.RequestConfig) (Responses, error) {
+	fmt.Println("No Proxy Check:", requestConfig.NoProxyCheck)
+
 	checkConnectionCtx, checkConnectionCtxCancel := context.WithTimeout(ctx, 8*time.Second)
 	if !checkConnection(checkConnectionCtx) {
 		checkConnectionCtxCancel()
@@ -38,6 +41,7 @@ func Run(ctx context.Context, requestConfig *config.RequestConfig) (Responses, e
 		requestConfig.GetValidDodosCountForProxies(),
 		requestConfig.GetMaxConns(fasthttp.DefaultMaxConnsPerHost),
 		requestConfig.Yes,
+		requestConfig.NoProxyCheck,
 		requestConfig.URL,
 	)
 	if clients == nil {

utils/types.go

@@ -0,0 +1,53 @@
+package utils
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+type Option[T any] struct {
+	value T
+	none  bool
+}
+
+func (o *Option[T]) IsNone() bool {
+	return o.none
+}
+
+func (o *Option[T]) ValueOrErr() (*T, error) {
+	if o.IsNone() {
+		return nil, errors.New("Option is None")
+	}
+	return &o.value, nil
+}
+
+func (o *Option[T]) ValueOr(def *T) *T {
+	if o.IsNone() {
+		return def
+	}
+	return &o.value
+}
+
+func (o *Option[T]) ValueOrPanic() *T {
+	if o.IsNone() {
+		panic("Option is None")
+	}
+	return &o.value
+}
+
+func (o *Option[T]) UnmarshalJSON(data []byte) error {
+	if string(data) == "null" {
+		o.none = true
+		return nil
+	}
+	o.none = false
+	return json.Unmarshal(data, &o.value)
+}
+
+func NewOption[T any](value T) Option[T] {
+	return Option[T]{value: value}
+}
+
+func NewNoneOption[T any]() Option[T] {
+	return Option[T]{none: true}
+}