Skip to content

fix：Modify the LoadURL method to provide proxy and timeout control. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix：Modify the LoadURL method to provide proxy and timeout control. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
176f797
fix：Modify the Load URL method to provide proxy and timeout control.
Joker-desire Mar 6, 2024
719633f
Merge branch 'antchfx:master' into master
Joker-desire Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import (
"fmt"
"io"
"net/http"
nurl "net/url"
"os"
"strings"
"time"

"github.com/antchfx/xpath"
"golang.org/x/net/html"
Expand Down Expand Up @@ -91,19 +93,42 @@ func QuerySelectorAll(top *html.Node, selector *xpath.Expr) []*html.Node {
}

// LoadURL loads the HTML document from the specified URL. Default enabling gzip on a HTTP request.
func LoadURL(url string) (*html.Node, error) {
func LoadURL(params ...interface{}) (*html.Node, error) {
var (
url string
proxy *nurl.URL
timeout = 10 * time.Second
transport = &http.Transport{}
)
for _, param := range params {
switch v := param.(type) {
case string:
url = v
case *nurl.URL:
proxy = v
case time.Duration:
timeout = v
}

}
if proxy != nil {
transport.Proxy = http.ProxyURL(proxy)
}
client := &http.Client{
Transport: transport,
Timeout: timeout,
}
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
}
// Enable gzip compression.
req.Header.Add("Accept-Encoding", "gzip")
resp, err := http.DefaultClient.Do(req)
resp, err := client.Do(req)
if err != nil {
return nil, err
}
var reader io.ReadCloser

defer func() {
if reader != nil {
reader.Close()
Expand Down
29 changes: 26 additions & 3 deletions query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ package htmlquery
import (
"compress/gzip"
"fmt"
"github.com/antchfx/xpath"
"golang.org/x/net/html"
"io/ioutil"
"net/http"
"net/http/httptest"
"net/url"
"os"
"strings"
"sync"
"testing"

"github.com/antchfx/xpath"
"golang.org/x/net/html"
"time"
)

const htmlSample = `<!DOCTYPE html><html lang="en-US">
Expand Down Expand Up @@ -198,3 +199,25 @@ func loadHTML(str string) *html.Node {
}
return node
}

func TestLoadURL_Proxy(t *testing.T) {
proxy, err := url.Parse("https://116.106.1.171:4002")
if err != nil {
t.Fatal(err)
}
doc, err := LoadURL("https://ip.smartproxy.com/json", proxy, 30*time.Second)
if err != nil {
t.Fatal(err)
}
output := OutputHTML(doc, true)
t.Log(output)
}

func TestLoadURL_Timeout(t *testing.T) {
node, err := LoadURL("https://ip.smartproxy.com/json", 5*time.Second)
if err != nil {
t.Fatal(err)
}
output := OutputHTML(node, true)
t.Log(output)
}