removed New()

replaced New() with agents = append(agents, &{PPROVIDER-NAME}.Agent{})

runner/runner.go

@@ -17,7 +17,6 @@ import (
 	"github.com/projectdiscovery/uncover/uncover/agent/fofa"
 	"github.com/projectdiscovery/uncover/uncover/agent/hunter"
 	"github.com/projectdiscovery/uncover/uncover/agent/netlas"
-	"github.com/projectdiscovery/uncover/uncover/agent/publicwww"
 	"github.com/projectdiscovery/uncover/uncover/agent/quake"
 	"github.com/projectdiscovery/uncover/uncover/agent/shodan"
 	"github.com/projectdiscovery/uncover/uncover/agent/shodanidb"
@@ -94,37 +93,35 @@ func (r *Runner) Run(ctx context.Context, query ...string) error {
 	// declare clients
 	for _, engine := range r.options.Engine {
 		var (
-			agent uncover.Agent
-			err   error
+			err error
 		)
 		switch engine {
 		case "shodan":
-			agent, err = shodan.New()
+			agents = append(agents, &shodan.Agent{})
 		case "censys":
-			agent, err = censys.New()
+			agents = append(agents, &censys.Agent{})
 		case "fofa":
-			agent, err = fofa.New()
+			agents = append(agents, &fofa.Agent{})
 		case "shodan-idb":
-			agent, err = shodanidb.New()
+			agents = append(agents, &shodanidb.Agent{})
 		case "quake":
-			agent, err = quake.New()
+			agents = append(agents, &quake.Agent{})
 		case "hunter":
-			agent, err = hunter.New()
+			agents = append(agents, &hunter.Agent{})
 		case "zoomeye":
-			agent, err = zoomeye.New()
+			agents = append(agents, &zoomeye.Agent{})
 		case "netlas":
-			agent, err = netlas.New()
+			agents = append(agents, &netlas.Agent{})
 		case "criminalip":
-			agent, err = criminalip.New()
+			agents = append(agents, &criminalip.Agent{})
 		case "publicwww":
-			agent, err = publicwww.New()
+			agents = append(agents, &criminalip.Agent{})
 		default:
 			err = errors.New("unknown agent type")
 		}
 		if err != nil {
 			return err
 		}
-		agents = append(agents, agent)
 	}
 
 	// open the output file - always overwrite

uncover/agent/censys/censys.go

@@ -18,10 +18,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "censys"
 }

uncover/agent/criminalip/criminalip.go

@@ -17,10 +17,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "criminalip"
 }

uncover/agent/fofa/fofa.go

@@ -20,10 +20,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "fofa"
 }

uncover/agent/hunter/hunter.go

@@ -17,10 +17,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "hunter"
 }

uncover/agent/netlas/netlas.go

@@ -16,10 +16,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "netlas"
 }

uncover/agent/publicwww/publicwww.go

@@ -18,10 +18,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "publicwww"
 }

uncover/agent/quake/quake.go

@@ -16,10 +16,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "quake"
 }

uncover/agent/shodan/shodan.go

@@ -17,10 +17,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "shodan"
 }

uncover/agent/shodanidb/shodan.go

@@ -18,10 +18,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "shodan-idb"
 }

uncover/agent/zoomeye/zoomeye.go

@@ -18,10 +18,6 @@ const (
 
 type Agent struct{}
 
-func New() (uncover.Agent, error) {
-	return &Agent{}, nil
-}
-
 func (agent *Agent) Name() string {
 	return "zoomeye"
 }

uncover/session.go

@@ -71,7 +71,13 @@ func NewSession(keys *Keys, retryMax, timeout, delay int, engines []string) (*Se
 	return session, nil
 }
 
-func (s *Session) Do(request *retryablehttp.Request) (*http.Response, error) {
+func (s *Session) Do(request *retryablehttp.Request, sources ...string) (*http.Response, error) {
+	for _, source := range sources {
+		err := s.RateLimits.Take(source)
+		if err != nil {
+			return nil, err
+		}
+	}
 	// close request connection (does not reuse connections)
 	request.Close = true
 	resp, err := s.Client.Do(request)