Proxy (#20)

* 新加连proxy服务功能

* dial proxy

Author: guonaihong

.gitignore

@@ -1,4 +1,5 @@
 *swp
+/.idea
 /coverage.out
 /cover.cov
 autobahn-testsuite

README.md

@@ -22,6 +22,7 @@ quickws是一个高性能的websocket库
 		* [配置握手时的超时时间](#配置握手时的超时时间)
 		* [配置自动回复ping消息](#配置自动回复ping消息)
 		* [配置socks5代理](#配置socks5代理)
+		* [配置proxy代理](#配置proxy代理)
 	* [服务配置参数](#服务端配置)
 		* [配置服务自动回复ping消息](#配置服务自动回复ping消息)
 ## 注意⚠️
@@ -210,6 +211,21 @@ func main() {
     }))
 }
 ```
+#### 配置proxy代理
+```go
+import(
+    "github.com/antlabs/quickws"
+)
+
+func main() {
+
+    proxy := func(*http.Request) (*url.URL, error) {
+        return url.Parse("http://127.0.0.1:1007")
+    }
+
+    quickws.Dial("ws://127.0.0.1:12345", quickws.WithClientProxyFunc(proxy))
+}
+```
 ### 服务端配置参数
 #### 配置服务自动回复ping消息
 ```go

autobahn/Makefile

@@ -1,8 +1,6 @@
 all:
 	# mac, arm64
 	GOOS=darwin GOARCH=arm64 go build -o autobahn-server-darwin-arm64 ./autobahn-server.go 
-	# mac, arm64
-	GOOS=darwin GOARCH=arm64 go build -tags=goexperiment.arenas -o autobahn-server-darwin-arm64-arena ./autobahn-server.go 
 	# linux amd64
 	GOOS=linux GOARCH=amd64 go build -o autobahn-server-linux-amd64 ./autobahn-server.go 
 

benchmark_rand_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

benchmark_read_write_message_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

callback.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

callback_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

client.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import (
 	"github.com/antlabs/wsutil/bytespool"
 	"github.com/antlabs/wsutil/enum"
 	"github.com/antlabs/wsutil/fixedreader"
+	"github.com/antlabs/wsutil/hostname"
 )
 
 var (
@@ -46,7 +47,9 @@ type DialOption struct {
 
 func ClientOptionToConf(opts ...ClientOption) *DialOption {
 	var dial DialOption
-	dial.defaultSetting()
+	if err := dial.defaultSetting(); err != nil {
+		panic(err.Error())
+	}
 	for _, o := range opts {
 		o(&dial)
 	}
@@ -82,7 +85,10 @@ func Dial(rawUrl string, opts ...ClientOption) (*Conn, error) {
 		dial.Header = make(http.Header)
 	}
 
-	dial.defaultSetting()
+	if err := dial.defaultSetting(); err != nil {
+		return nil, err
+	}
+
 	for _, o := range opts {
 		o(&dial)
 	}
@@ -122,6 +128,10 @@ func (d *DialOption) handshake() (*http.Request, string, error) {
 		d.Header.Add("Sec-WebSocket-Extensions", strExtensions)
 	}
 
+	if len(d.subProtocols) > 0 {
+		d.Header["Sec-WebSocket-Protocol"] = []string{strings.Join(d.subProtocols, ", ")}
+	}
+
 	req.Header = d.Header
 	return req, secWebSocket, nil
 }
@@ -178,23 +188,36 @@ func (d *DialOption) tlsConn(c net.Conn) net.Conn {
 }
 
 func (d *DialOption) Dial() (c *Conn, err error) {
+	// scheme ws -> http
+	// scheme wss -> https
 	req, secWebSocket, err := d.handshake()
 	if err != nil {
 		return nil, err
 	}
 
 	var conn net.Conn
 	begin := time.Now()
+
+	hostName := hostname.GetHostName(d.u)
 	// conn, err := net.DialTimeout("tcp", d.u.Host /* TODO 加端号*/, d.dialTimeout)
-	if d.dialFunc == nil {
-		conn, err = net.Dial("tcp", d.u.Host /* TODO 加端号*/)
-	} else {
+	dialFunc := net.Dial
+	if d.dialFunc != nil {
 		dialInterface, err := d.dialFunc()
 		if err != nil {
 			return nil, err
 		}
-		conn, err = dialInterface.Dial("tcp", d.u.Host)
+		dialFunc = dialInterface.Dial
 	}
+
+	if d.proxyFunc != nil {
+		proxyURL, err := d.proxyFunc(req)
+		if err != nil {
+			return nil, err
+		}
+		dialFunc = newhttpProxy(proxyURL, dialFunc).Dial
+	}
+
+	conn, err = dialFunc("tcp", hostName)
 	if err != nil {
 		return nil, err
 	}

client_option_test.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

client_options.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 antlabs. All rights reserved.
+// Copyright 2021-2024 antlabs. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.