add ReadAsSSEWithContext

dara/core.go

@@ -94,7 +94,6 @@ type RuntimeObject struct {
 	IgnoreSSL         *bool                  `json:"ignoreSSL" xml:"ignoreSSL"`
 	ReadTimeout       *int                   `json:"readTimeout" xml:"readTimeout"`
 	ConnectTimeout    *int                   `json:"connectTimeout" xml:"connectTimeout"`
-	IdleTimeout       *int                   `json:"idleTimeout" xml:"idleTimeout"`
 	LocalAddr         *string                `json:"localAddr" xml:"localAddr"`
 	HttpProxy         *string                `json:"httpProxy" xml:"httpProxy"`
 	HttpsProxy        *string                `json:"httpsProxy" xml:"httpsProxy"`
@@ -115,7 +114,7 @@ type RuntimeObject struct {
 
 func (r *RuntimeObject) getClientTag(domain string) string {
 	return strconv.FormatBool(BoolValue(r.IgnoreSSL)) + strconv.Itoa(IntValue(r.ReadTimeout)) +
-		strconv.Itoa(IntValue(r.ConnectTimeout)) + strconv.Itoa(IntValue(r.IdleTimeout)) + StringValue(r.LocalAddr) + StringValue(r.HttpProxy) +
+		strconv.Itoa(IntValue(r.ConnectTimeout)) + StringValue(r.LocalAddr) + StringValue(r.HttpProxy) +
 		StringValue(r.HttpsProxy) + StringValue(r.NoProxy) + StringValue(r.Socks5Proxy) + StringValue(r.Socks5NetWork) + domain
 }
 
@@ -129,7 +128,6 @@ func NewRuntimeObject(runtime map[string]interface{}) *RuntimeObject {
 		IgnoreSSL:      TransInterfaceToBool(runtime["ignoreSSL"]),
 		ReadTimeout:    TransInterfaceToInt(runtime["readTimeout"]),
 		ConnectTimeout: TransInterfaceToInt(runtime["connectTimeout"]),
-		IdleTimeout:    TransInterfaceToInt(runtime["idleTimeout"]),
 		LocalAddr:      TransInterfaceToString(runtime["localAddr"]),
 		HttpProxy:      TransInterfaceToString(runtime["httpProxy"]),
 		HttpsProxy:     TransInterfaceToString(runtime["httpsProxy"]),
@@ -323,7 +321,7 @@ func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Respon
 		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
 			defaultClient.httpClient.Transport = trans
 		}
-		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ConnectTimeout)+IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
 		defaultClient.ifInit = true
 		defaultClient.Unlock()
 	}
@@ -442,7 +440,7 @@ func DoRequestWithCtx(ctx context.Context, request *Request, runtimeObject *Runt
 		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
 			defaultClient.httpClient.Transport = trans
 		}
-		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ConnectTimeout)+IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
 		defaultClient.ifInit = true
 		defaultClient.Unlock()
 	}
@@ -504,7 +502,6 @@ func DoRequestWithCtx(ctx context.Context, request *Request, runtimeObject *Runt
 
 func getHttpTransport(req *Request, runtime *RuntimeObject) (*http.Transport, error) {
 	trans := new(http.Transport)
-	trans.ResponseHeaderTimeout = time.Duration(IntValue(runtime.ReadTimeout)) * time.Millisecond
 	httpProxy, err := getHttpProxy(StringValue(req.Protocol), StringValue(req.Domain), runtime)
 	if err != nil {
 		return nil, err
@@ -558,7 +555,7 @@ func getHttpTransport(req *Request, runtime *RuntimeObject) (*http.Transport, er
 					Password: password,
 				}
 			}
-			dialer, err := proxy.SOCKS5(strings.ToLower(StringValue(runtime.Socks5NetWork)), socks5Proxy.Host, auth,
+			dialer, err := proxy.SOCKS5(strings.ToLower(StringValue(runtime.Socks5NetWork)), socks5Proxy.String(), auth,
 				&net.Dialer{
 					Timeout:   time.Duration(IntValue(runtime.ConnectTimeout)) * time.Millisecond,
 					DualStack: true,
@@ -576,9 +573,6 @@ func getHttpTransport(req *Request, runtime *RuntimeObject) (*http.Transport, er
 		trans.MaxIdleConns = IntValue(runtime.MaxIdleConns)
 		trans.MaxIdleConnsPerHost = IntValue(runtime.MaxIdleConns)
 	}
-	if runtime.IdleTimeout != nil && *runtime.IdleTimeout > 0 {
-		trans.IdleConnTimeout = time.Duration(IntValue(runtime.IdleTimeout)) * time.Millisecond
-	}
 	return trans, nil
 }
 
@@ -697,7 +691,7 @@ func getSocks5Proxy(runtime *RuntimeObject) (proxy *url.URL, err error) {
 func getLocalAddr(localAddr string) (addr *net.TCPAddr) {
 	if localAddr != "" {
 		addr = &net.TCPAddr{
-			IP: net.ParseIP(localAddr),
+			IP: []byte(localAddr),
 		}
 	}
 	return addr
@@ -705,17 +699,20 @@ func getLocalAddr(localAddr string) (addr *net.TCPAddr) {
 
 func setDialContext(runtime *RuntimeObject) func(cxt context.Context, net, addr string) (c net.Conn, err error) {
 	return func(ctx context.Context, network, address string) (net.Conn, error) {
-		timeout := time.Duration(IntValue(runtime.ConnectTimeout)) * time.Millisecond
-		dialer := &net.Dialer{
-			Timeout: timeout,
-			Resolver: &net.Resolver{
-				PreferGo: false,
-			},
-		}
 		if runtime.LocalAddr != nil && StringValue(runtime.LocalAddr) != "" {
-			dialer.LocalAddr = getLocalAddr(StringValue(runtime.LocalAddr))
+			netAddr := &net.TCPAddr{
+				IP: []byte(StringValue(runtime.LocalAddr)),
+			}
+			return (&net.Dialer{
+				Timeout:   time.Duration(IntValue(runtime.ConnectTimeout)) * time.Second,
+				DualStack: true,
+				LocalAddr: netAddr,
+			}).DialContext(ctx, network, address)
 		}
-		return dialer.DialContext(ctx, network, address)
+		return (&net.Dialer{
+			Timeout:   time.Duration(IntValue(runtime.ConnectTimeout)) * time.Second,
+			DualStack: true,
+		}).DialContext(ctx, network, address)
 	}
 }
 

dara/core_test.go

@@ -732,37 +732,12 @@ func Test_DoRequest(t *testing.T) {
 			return mockResponse(200, ``, nil)
 		}
 	}
-	// Test socks5 proxy with user:password@host format
 	runtimeObj["socks5Proxy"] = "socks5://someuser:somepassword@ecs.aliyun.com"
 	runtimeObj["localAddr"] = "127.0.0.1"
 	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
 	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
 
-	// Test socks5 proxy with explicit port
-	runtimeObj["socks5Proxy"] = "socks5://someuser:somepassword@ecs.aliyun.com:1080"
-	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
-	// Test socks5 proxy without authentication
-	runtimeObj["socks5Proxy"] = "socks5://proxy.example.com:1080"
-	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
-	// Test socks5 proxy with IPv6 address
-	runtimeObj["socks5Proxy"] = "socks5://[::1]:1080"
-	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
-	// Test socks5 proxy with IPv6 and authentication
-	runtimeObj["socks5Proxy"] = "socks5://user:pass@[2001:db8::1]:1080"
-	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
 	runtimeObj["key"] = "private rsa key"
 	runtimeObj["cert"] = "private certification"
 	runtimeObj["ca"] = "private ca"
@@ -1531,49 +1506,3 @@ func TestForceUint64(t *testing.T) {
 		}
 	}
 }
-
-func Test_getLocalAddr(t *testing.T) {
-	// Test empty address
-	addr := getLocalAddr("")
-	utils.AssertNil(t, addr)
-
-	// Test valid IPv4 address
-	addr = getLocalAddr("127.0.0.1")
-	utils.AssertNotNil(t, addr)
-	utils.AssertEqual(t, "127.0.0.1", addr.IP.String())
-
-	// Test valid IPv6 address
-	addr = getLocalAddr("::1")
-	utils.AssertNotNil(t, addr)
-	utils.AssertEqual(t, "::1", addr.IP.String())
-
-	// Test invalid IP
-	addr = getLocalAddr("invalid")
-	utils.AssertNotNil(t, addr)
-	utils.AssertNil(t, addr.IP)
-}
-
-func Test_setDialContext(t *testing.T) {
-	runtime := &RuntimeObject{
-		ConnectTimeout: Int(1000),
-		LocalAddr:      String("127.0.0.1"),
-	}
-	dialerFunc := setDialContext(runtime)
-	utils.AssertNotNil(t, dialerFunc)
-}
-
-func Test_TimeoutLogic(t *testing.T) {
-	runtime := &RuntimeObject{
-		ConnectTimeout: Int(1000),
-		ReadTimeout:    Int(2000),
-	}
-	
-	req := &Request{
-		Protocol: String("http"),
-		Domain:   String("localhost"),
-	}
-	trans, err := getHttpTransport(req, runtime)
-	utils.AssertNil(t, err)
-	utils.AssertNotNil(t, trans)
-	utils.AssertEqual(t, time.Duration(2000)*time.Millisecond, trans.ResponseHeaderTimeout)
-}

tea/tea.go

@@ -386,7 +386,7 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons
 		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
 			defaultClient.httpClient.Transport = trans
 		}
-		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ConnectTimeout)+IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
 		defaultClient.ifInit = true
 		defaultClient.Unlock()
 	}
@@ -442,7 +442,6 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons
 
 func getHttpTransport(req *Request, runtime *RuntimeObject) (*http.Transport, error) {
 	trans := new(http.Transport)
-	trans.ResponseHeaderTimeout = time.Duration(IntValue(runtime.ReadTimeout)) * time.Millisecond
 	httpProxy, err := getHttpProxy(StringValue(req.Protocol), StringValue(req.Domain), runtime)
 	if err != nil {
 		return nil, err
@@ -496,7 +495,7 @@ func getHttpTransport(req *Request, runtime *RuntimeObject) (*http.Transport, er
 					Password: password,
 				}
 			}
-			dialer, err := proxy.SOCKS5(strings.ToLower(StringValue(runtime.Socks5NetWork)), socks5Proxy.Host, auth,
+			dialer, err := proxy.SOCKS5(strings.ToLower(StringValue(runtime.Socks5NetWork)), socks5Proxy.String(), auth,
 				&net.Dialer{
 					Timeout:   time.Duration(IntValue(runtime.ConnectTimeout)) * time.Millisecond,
 					DualStack: true,
@@ -603,7 +602,7 @@ func getSocks5Proxy(runtime *RuntimeObject) (proxy *url.URL, err error) {
 func getLocalAddr(localAddr string) (addr *net.TCPAddr) {
 	if localAddr != "" {
 		addr = &net.TCPAddr{
-			IP: net.ParseIP(localAddr),
+			IP: []byte(localAddr),
 		}
 	}
 	return addr
@@ -611,18 +610,20 @@ func getLocalAddr(localAddr string) (addr *net.TCPAddr) {
 
 func setDialContext(runtime *RuntimeObject) func(cxt context.Context, net, addr string) (c net.Conn, err error) {
 	return func(ctx context.Context, network, address string) (net.Conn, error) {
-		timeout := time.Duration(IntValue(runtime.ConnectTimeout)) * time.Millisecond
-		dialer := &net.Dialer{
-			Timeout: timeout,
-			Resolver: &net.Resolver{
-				PreferGo: false,
-			},
-			DualStack: true,
-		}
 		if runtime.LocalAddr != nil && StringValue(runtime.LocalAddr) != "" {
-			dialer.LocalAddr = getLocalAddr(StringValue(runtime.LocalAddr))
+			netAddr := &net.TCPAddr{
+				IP: []byte(StringValue(runtime.LocalAddr)),
+			}
+			return (&net.Dialer{
+				Timeout:   time.Duration(IntValue(runtime.ConnectTimeout)) * time.Second,
+				DualStack: true,
+				LocalAddr: netAddr,
+			}).DialContext(ctx, network, address)
 		}
-		return dialer.DialContext(ctx, network, address)
+		return (&net.Dialer{
+			Timeout:   time.Duration(IntValue(runtime.ConnectTimeout)) * time.Second,
+			DualStack: true,
+		}).DialContext(ctx, network, address)
 	}
 }
 

tea/tea_test.go

@@ -560,37 +560,12 @@ func Test_DoRequest(t *testing.T) {
 			return mockResponse(200, ``, nil)
 		}
 	}
-	// Test socks5 proxy with user:password@host format
 	runtimeObj["socks5Proxy"] = "socks5://someuser:somepassword@ecs.aliyun.com"
 	runtimeObj["localAddr"] = "127.0.0.1"
 	resp, err = DoRequest(request, runtimeObj)
 	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
 
-	// Test socks5 proxy with explicit port
-	runtimeObj["socks5Proxy"] = "socks5://someuser:somepassword@ecs.aliyun.com:1080"
-	resp, err = DoRequest(request, runtimeObj)
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
-	// Test socks5 proxy without authentication
-	runtimeObj["socks5Proxy"] = "socks5://proxy.example.com:1080"
-	resp, err = DoRequest(request, runtimeObj)
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
-	// Test socks5 proxy with IPv6 address
-	runtimeObj["socks5Proxy"] = "socks5://[::1]:1080"
-	resp, err = DoRequest(request, runtimeObj)
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
-	// Test socks5 proxy with IPv6 and authentication
-	runtimeObj["socks5Proxy"] = "socks5://user:pass@[2001:db8::1]:1080"
-	resp, err = DoRequest(request, runtimeObj)
-	utils.AssertNil(t, err)
-	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
-
 	runtimeObj["key"] = "private rsa key"
 	runtimeObj["cert"] = "private certification"
 	runtimeObj["ca"] = "private ca"
@@ -967,49 +942,3 @@ func Test_TransInt32AndInt(t *testing.T) {
 	b := ToInt32(a)
 	utils.AssertEqual(t, Int32Value(b), int32(10))
 }
-
-func Test_getLocalAddr(t *testing.T) {
-	// Test empty address
-	addr := getLocalAddr("")
-	utils.AssertNil(t, addr)
-
-	// Test valid IPv4 address
-	addr = getLocalAddr("127.0.0.1")
-	utils.AssertNotNil(t, addr)
-	utils.AssertEqual(t, "127.0.0.1", addr.IP.String())
-
-	// Test valid IPv6 address
-	addr = getLocalAddr("::1")
-	utils.AssertNotNil(t, addr)
-	utils.AssertEqual(t, "::1", addr.IP.String())
-
-	// Test invalid IP
-	addr = getLocalAddr("invalid")
-	utils.AssertNotNil(t, addr)
-	utils.AssertNil(t, addr.IP)
-}
-
-func Test_setDialContext(t *testing.T) {
-	runtime := &RuntimeObject{
-		ConnectTimeout: Int(1000),
-		LocalAddr:      String("127.0.0.1"),
-	}
-	dialerFunc := setDialContext(runtime)
-	utils.AssertNotNil(t, dialerFunc)
-}
-
-func Test_TimeoutLogic(t *testing.T) {
-	runtime := &RuntimeObject{
-		ConnectTimeout: Int(1000),
-		ReadTimeout:    Int(2000),
-	}
-	
-	req := &Request{
-		Protocol: String("http"),
-		Domain:   String("localhost"),
-	}
-	trans, err := getHttpTransport(req, runtime)
-	utils.AssertNil(t, err)
-	utils.AssertNotNil(t, trans)
-	utils.AssertEqual(t, time.Duration(2000)*time.Millisecond, trans.ResponseHeaderTimeout)
-}