Improvements

Author: andyone

README.md

@@ -1,7 +1,7 @@
 <p align="center"><a href="#readme"><img src="https://gh.kaos.st/sslscan.svg"/></a></p>
 
 <p align="center">
-  <a href="https://pkg.go.dev/pkg.re/essentialkaos/sslscan.v12"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev"></a>
+  <a href="https://pkg.re/essentialkaos/sslscan.v13?docs"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev"></a>
   <a href="https://goreportcard.com/report/github.com/essentialkaos/sslscan"><img src="https://goreportcard.com/badge/github.com/essentialkaos/sslscan"></a>
   <a href="https://codebeat.co/projects/github-com-essentialkaos-sslscan"><img src="https://codebeat.co/badges/59a17b0e-b974-425e-a442-b9bcc3ccf7c0"></a>
   <a href="https://github.com/essentialkaos/sslscan/actions"><img src="https://github.com/essentialkaos/sslscan/workflows/CI/badge.svg" alt="GitHub Actions Status" /></a>
@@ -20,13 +20,13 @@ Package for Go for working with [SSLLabs](https://www.ssllabs.com) public API.
 To build the SSLScan from scratch, make sure you have a working Go 1.14+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```
-go get pkg.re/essentialkaos/sslscan.v12
+go get pkg.re/essentialkaos/sslscan.v13
 ```
 
 If you want update SSLScan package to latest stable release, do:
 
 ```
-go get -u pkg.re/essentialkaos/sslscan.v12
+go get -u pkg.re/essentialkaos/sslscan.v13
 ```
 
 ### Build Status

sslscan.go

@@ -149,13 +149,14 @@ const (
 )
 
 // VERSION is current package version
-const VERSION = "12.0.0"
+const VERSION = "13.0.0"
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 type API struct {
-	Info   *Info
-	Client *fasthttp.Client
+	RequestTimeout time.Duration
+	Info           *Info
+	Client         *fasthttp.Client
 }
 
 type AnalyzeParams struct {
@@ -506,8 +507,21 @@ type HTTPHeader struct {
 	Value string `json:"value"`
 }
 
-// RequestTimeout is request timeout in seconds
-var RequestTimeout = 10.0
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+type HTTPError struct {
+	StatusCode   int
+	ResponseData string
+}
+
+func (e *HTTPError) Error() string {
+	return fmt.Sprintf("API returned HTTP code %d", e.StatusCode)
+}
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+
+// RequestTimeout is default request timeout
+var RequestTimeout = 10 * time.Second
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
@@ -518,11 +532,10 @@ func NewAPI(app, version string) (*API, error) {
 	}
 
 	api := &API{
+		RequestTimeout: RequestTimeout,
 		Client: &fasthttp.Client{
 			Name:                getUserAgent(app, version),
 			MaxIdleConnDuration: 5 * time.Second,
-			ReadTimeout:         time.Duration(RequestTimeout) * time.Second,
-			WriteTimeout:        time.Duration(RequestTimeout) * time.Second,
 			MaxConnsPerHost:     100,
 		},
 	}
@@ -624,6 +637,8 @@ func (ap *AnalyzeProgress) GetEndpointInfo(ip string, fromCache bool) (*Endpoint
 
 // doRequest sends request through http client
 func (api *API) doRequest(uri string, result interface{}) error {
+	var err error
+
 	req := fasthttp.AcquireRequest()
 	resp := fasthttp.AcquireResponse()
 
@@ -632,7 +647,11 @@ func (api *API) doRequest(uri string, result interface{}) error {
 	defer fasthttp.ReleaseRequest(req)
 	defer fasthttp.ReleaseResponse(resp)
 
-	err := api.Client.Do(req, resp)
+	if api.RequestTimeout == 0 {
+		err = api.Client.Do(req, resp)
+	} else {
+		err = api.Client.DoTimeout(req, resp, api.RequestTimeout)
+	}
 
 	if err != nil {
 		return err
@@ -641,7 +660,7 @@ func (api *API) doRequest(uri string, result interface{}) error {
 	statusCode := resp.StatusCode()
 
 	if statusCode != 200 {
-		return fmt.Errorf("API return HTTP code %d", statusCode)
+		return &HTTPError{StatusCode: statusCode, ResponseData: resp.String()}
 	}
 
 	if result == nil {

sslscan_test.go

@@ -17,7 +17,7 @@ import (
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
-const _TESTER_VERSION = "9.0.0"
+const _TESTER_VERSION = "10.0.0"
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
@@ -34,7 +34,7 @@ var _ = check.Suite(&SSLLabsSuite{})
 func (s *SSLLabsSuite) TestInfo(c *check.C) {
 	api, err := NewAPI("SSLScanTester", _TESTER_VERSION)
 
-	RequestTimeout = 3.0
+	api.RequestTimeout = 5 * time.Second
 
 	c.Assert(err, check.IsNil)
 	c.Assert(api, check.NotNil)
@@ -46,7 +46,7 @@ func (s *SSLLabsSuite) TestInfo(c *check.C) {
 func (s *SSLLabsSuite) TestAnalyze(c *check.C) {
 	api, err := NewAPI("SSLScanTester", _TESTER_VERSION)
 
-	RequestTimeout = 3.0
+	api.RequestTimeout = 5 * time.Second
 
 	c.Assert(err, check.IsNil)
 	c.Assert(api, check.NotNil)