add httpclient config in dara

dara/array.go

@@ -294,8 +294,28 @@ func ConcatArr(arr1 interface{}, arr2 interface{}) interface{} {
 }
 
 // ArrAppend inserts a new pointer at a specified index in a pointer array.
-func ArrAppend(arr interface{}, value interface{}) {
-	ArrPush(arr, value)
+func ArrAppend(arr interface{}, value interface{}, index int) {
+	arrV := reflect.ValueOf(arr)
+	if arrV.Kind() != reflect.Ptr || arrV.Elem().Kind() != reflect.Slice {
+		return
+	}
+
+	sliceV := arrV.Elem()
+
+	if index < 0 || index > sliceV.Len() {
+		return
+	}
+
+	valueV := reflect.ValueOf(value)
+
+	// 创建一个容纳新值的切片
+	newSlice := reflect.Append(sliceV, reflect.Zero(sliceV.Type().Elem()))
+	reflect.Copy(newSlice.Slice(index+1, newSlice.Len()), newSlice.Slice(index, newSlice.Len()-1))
+	newSlice.Index(index).Set(valueV)
+
+	// 更新原始切片
+	sliceV.Set(newSlice)
+	return
 }
 
 // ArrRemove removes an element from the array

dara/array_test.go

@@ -405,6 +405,54 @@ func TestConcatArr(t *testing.T) {
 	}
 }
 
+func TestArrAppend(t *testing.T) {
+	// 测试用例1：插入中间位置
+	t.Run("Append to middle of an array", func(t *testing.T) {
+		numbers := []*int{new(int), new(int), new(int)}
+		for i := range numbers {
+			*numbers[i] = i + 1
+		}
+
+		// 将 9 插入到索引 1
+		valueToInsert := new(int)
+		*valueToInsert = 9
+
+		// 期望的结果
+		expected := []*int{new(int), new(int), new(int), new(int)}
+		*expected[0], *expected[1], *expected[2], *expected[3] = 1, 9, 2, 3
+
+		defer func() {
+			if !reflect.DeepEqual(numbers, expected) {
+				t.Errorf("Expected %+v, but got %+v", expected, numbers)
+			}
+		}()
+
+		ArrAppend(&numbers, valueToInsert, 1)
+	})
+
+	// 测试用例2: 尝试在越界处插入
+	t.Run("Index out of bounds", func(t *testing.T) {
+		numbers := []*int{new(int), new(int), new(int)}
+		for i := range numbers {
+			*numbers[i] = i + 1
+		}
+
+		defer func() {
+			// Defer 检查：越界情况下，数组应保持不变
+			expected := []*int{new(int), new(int), new(int)}
+			*expected[0], *expected[1], *expected[2] = 1, 2, 3
+			if !reflect.DeepEqual(numbers, expected) {
+				t.Errorf("Index out of bounds should not modify array, but got %+v", numbers)
+			}
+		}()
+
+		valueToInsert := new(int)
+		*valueToInsert = 9
+		ArrAppend(&numbers, valueToInsert, 10) // 超出范围
+	})
+}
+
+
 func TestArrRemove(t *testing.T) {
 	// Create test data for string pointer array
 	str1 := "A"

dara/core.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"github.com/alibabacloud-go/debug/debug"
-	"github.com/alibabacloud-go/tea/utils"
 	util "github.com/alibabacloud-go/tea-utils/v2/service"
+	"github.com/alibabacloud-go/tea/utils"
 
 	"golang.org/x/net/proxy"
 )
@@ -34,8 +34,28 @@ type RuntimeOptions = util.RuntimeOptions
 type ExtendsParameters = util.ExtendsParameters
 
 var debugLog = debug.Init("dara")
+type HttpRequest interface {
+}
 
-var hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+type HttpResponse interface {
+}
+
+type HttpClient interface {
+	Call(request *http.Request, transport *http.Transport) (response *http.Response, err error)
+}
+
+type daraClient struct {
+	sync.Mutex
+	httpClient *http.Client
+	ifInit     bool
+}
+
+func (client *daraClient) Call(request *http.Request, transport *http.Transport) (response *http.Response, err error) {
+	response, err = client.httpClient.Do(request)
+	return
+}
+
+var hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 	return fn
 }
 
@@ -88,12 +108,7 @@ type RuntimeObject struct {
 	Logger            *utils.Logger          `json:"logger" xml:"logger"`
 	RetryOptions      *RetryOptions          `json:"retryOptions" xml:"retryOptions"`
 	ExtendsParameters *ExtendsParameters     `json:"extendsParameters,omitempty" xml:"extendsParameters,omitempty"`
-}
-
-type daraClient struct {
-	sync.Mutex
-	httpClient *http.Client
-	ifInit     bool
+	HttpClient
 }
 
 func (r *RuntimeObject) getClientTag(domain string) string {
@@ -132,6 +147,9 @@ func NewRuntimeObject(runtime map[string]interface{}) *RuntimeObject {
 	if runtime["logger"] != nil {
 		runtimeObject.Logger = runtime["logger"].(*utils.Logger)
 	}
+	if runtime["httpClient"] != nil {
+		runtimeObject.HttpClient = runtime["httpClient"].(HttpClient)
+	}
 	return runtimeObject
 }
 
@@ -202,7 +220,7 @@ func getDaraClient(tag string) *daraClient {
 
 // DoRequest is used send request to server
 func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Response, err error) {
-	if(runtimeObject == nil) {
+	if runtimeObject == nil {
 		runtimeObject = &RuntimeObject{}
 	}
 	fieldMap := make(map[string]string)
@@ -250,18 +268,27 @@ func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Respon
 	}
 	httpRequest.Host = StringValue(request.Domain)
 
-	client := getDaraClient(runtimeObject.getClientTag(StringValue(request.Domain)))
-	client.Lock()
-	if !client.ifInit {
-		trans, err := getHttpTransport(request, runtimeObject)
-		if err != nil {
-			return nil, err
-		}
-		client.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
-		client.httpClient.Transport = trans
-		client.ifInit = true
+	var client HttpClient
+	if runtimeObject.HttpClient == nil {
+		client = getDaraClient(runtimeObject.getClientTag(StringValue(request.Domain)))
+	} else {
+		client = runtimeObject.HttpClient
 	}
-	client.Unlock()
+
+	trans, err := getHttpTransport(request, runtimeObject)
+	if err != nil {
+		return
+	}
+	if defaultClient, ok := client.(*daraClient); ok {
+		defaultClient.Lock()
+		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
+			defaultClient.httpClient.Transport = trans
+		}
+		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		defaultClient.ifInit = true
+		defaultClient.Unlock()
+	}
+
 	for key, value := range request.Headers {
 		if value == nil || key == "content-length" {
 			continue
@@ -283,7 +310,7 @@ func DoRequest(request *Request, runtimeObject *RuntimeObject) (response *Respon
 	putMsgToMap(fieldMap, httpRequest)
 	startTime := time.Now()
 	fieldMap["{start_time}"] = startTime.Format("2006-01-02 15:04:05")
-	res, err := hookDo(client.httpClient.Do)(httpRequest)
+	res, err := hookDo(client.Call)(httpRequest, trans)
 	fieldMap["{cost}"] = time.Since(startTime).String()
 	completedBytes := int64(0)
 	if runtimeObject.Tracker != nil {
@@ -429,6 +456,32 @@ func ToReader(obj interface{}) io.Reader {
 	}
 }
 
+func ToWriter(obj interface{}) io.Writer {
+	switch obj.(type) {
+	case string:
+		var buf bytes.Buffer
+		buf.WriteString(obj.(string))
+		return &buf
+	case *string:
+		var buf bytes.Buffer
+		tmp := obj.(*string)
+		buf.WriteString(*tmp)
+		return &buf
+	case []byte:
+		var buf bytes.Buffer
+		buf.Write(obj.([]byte))
+		return &buf
+	case io.Writer:
+		return obj.(io.Writer)
+	case *bytes.Buffer:
+		return obj.(*bytes.Buffer)
+	case *os.File:
+		return obj.(*os.File)
+	default:
+		panic("Invalid Writer. Please provide a valid Writer.")
+	}
+}
+
 func ToString(val interface{}) string {
 	switch v := val.(type) {
 	case []byte:

dara/core_test.go

@@ -488,12 +488,36 @@ func Test_GetBackoffTime(t *testing.T) {
 	ms = GetBackoffTime(backoff, Int(1))
 	utils.AssertEqual(t, true, IntValue(ms) <= 3)
 }
+type httpClient struct {
+	HttpClient
+	httpClient *http.Client
+}
+
+func newHttpClient() (*httpClient, error) {
+	client := new(httpClient)
+	err := client.Init()
+	return client, err
+}
+
+func (client *httpClient) Init() (_err error) {
+	return nil
+}
+
+func (client *httpClient) Call(request *http.Request, transport *http.Transport) (_result *http.Response, _err error) {
+	if transport != nil {
+		trans := transport.Clone()
+		client.httpClient.Transport = trans
+	} else {
+		client.httpClient.Transport = http.DefaultTransport.(*http.Transport).Clone()
+	}
+	return client.httpClient.Do(request)
+}
 
 func Test_DoRequest(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
 	}
@@ -532,8 +556,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, resp)
 	utils.AssertContains(t, err.Error(), ` invalid URL escape "%gf"`)
 
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -581,8 +605,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
 
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			utils.AssertEqual(t, "tea-cn-hangzhou.aliyuncs.com:1080", req.Host)
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
@@ -594,13 +618,20 @@ func Test_DoRequest(t *testing.T) {
 	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, `Internal error`, err.Error())
+
+	httpClient, err := newHttpClient()
+	utils.AssertNil(t, err)
+	runtimeObj["httpClient"] = httpClient
+	resp, err = DoRequest(request, NewRuntimeObject(runtimeObj))
+	utils.AssertNil(t, resp)
+	utils.AssertEqual(t, `Internal error`, err.Error())
 }
 
 func Test_DoRequestWithConcurrent(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -696,11 +727,11 @@ func Test_SetDialContext(t *testing.T) {
 }
 
 func Test_hookdo(t *testing.T) {
-	fn := func(req *http.Request) (*http.Response, error) {
+	fn := func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 		return nil, errors.New("hookdo")
 	}
 	result := hookDo(fn)
-	resp, err := result(nil)
+	resp, err := result(nil, nil)
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, "hookdo", err.Error())
 }
@@ -735,6 +766,42 @@ func Test_ToReader(t *testing.T) {
 	utils.AssertEqual(t, "", string(byt))
 }
 
+func Test_ToWriter(t *testing.T) {
+	str := "abc"
+	writer := ToWriter(str).(*bytes.Buffer)
+	utils.AssertEqual(t, "abc", writer.String())
+
+	strPtr := new(string)
+	*strPtr = "def"
+	writer = ToWriter(strPtr).(*bytes.Buffer)
+	utils.AssertEqual(t, "def", writer.String())
+
+	bytesData := []byte("ghi")
+	writer = ToWriter(bytesData).(*bytes.Buffer)
+	utils.AssertEqual(t, "ghi", writer.String())
+
+	buffer := new(bytes.Buffer)
+	writer = ToWriter(buffer).(*bytes.Buffer)
+	utils.AssertEqual(t, buffer, writer)
+
+	fileWriter := ToWriter(os.Stdout)
+	utils.AssertEqual(t, os.Stdout, fileWriter)
+
+	var buf bytes.Buffer
+	writer2 := ToWriter(&buf)
+	writer2.Write([]byte("test"))
+	utils.AssertEqual(t, "test", buf.String())
+
+	// Test a non-writer to trigger panic
+	defer func() {
+		if r := recover(); r != nil {
+			utils.AssertEqual(t, "Invalid Writer. Please provide a valid Writer.", r)
+		}
+	}()
+	num := 10
+	ToWriter(num) // This should cause a panic
+}
+
 func Test_ToString(t *testing.T) {
 	str := ToString(10)
 	utils.AssertEqual(t, "10", str)

dara/error.go

@@ -7,18 +7,22 @@ import (
 	"net/http"
 	"reflect"
 	"strconv"
+	"github.com/alibabacloud-go/tea/tea"
 )
 
 type BaseError interface {
 	error
-	ErrorName() *string
-	ErrorCode() *string
+	GetName() *string
+	GetCode() *string
 }
 
 type ResponseError interface {
 	BaseError
-	ErrorRetryAfter() *int
-	ErrorStatusCode() *int
+	GetRetryAfter() *int64
+	GetStatusCode() *int
+	GetAccessDeniedDetail() map[string]interface{}
+	GetDescription() *string
+	GetData() map[string]interface{}
 }
 
 // SDKError struct is used save error code and message
@@ -40,6 +44,43 @@ type CastError struct {
 	Message *string
 }
 
+func TeaSDKError(err error) error {
+	if(err == nil) {
+		return nil
+	}
+
+	if te, ok := err.(*SDKError); ok {
+		return tea.NewSDKError(map[string]interface{}{
+			"code": StringValue(te.Code),
+			"statusCode": IntValue(te.StatusCode),
+			"message": StringValue(te.Message),
+			"data": te.Data,
+			"description": StringValue(te.Description),
+			"accessDeniedDetail": te.AccessDeniedDetail,
+		})
+	}
+
+	if respErr, ok := err.(ResponseError); ok { 
+		return tea.NewSDKError(map[string]interface{}{
+			"code": StringValue(respErr.GetCode()),
+			"statusCode": IntValue(respErr.GetStatusCode()),
+			"message": respErr.Error(),
+			"description": StringValue(respErr.GetDescription()),
+			"data": respErr.GetData(),
+			"accessDeniedDetail": respErr.GetAccessDeniedDetail(),
+		})
+	}
+
+	if baseErr, ok := err.(BaseError); ok { 
+		return tea.NewSDKError(map[string]interface{}{
+			"code": StringValue(baseErr.GetCode()),
+			"message": baseErr.Error(),
+		})
+	}
+
+	return err
+}
+
 // NewSDKError is used for shortly create SDKError object
 func NewSDKError(obj map[string]interface{}) *SDKError {
 	err := &SDKError{}
@@ -49,7 +90,7 @@ func NewSDKError(obj map[string]interface{}) *SDKError {
 	} else if val, ok := obj["code"].(string); ok {
 		err.Code = String(val)
 	}
-
+ 
 	if obj["message"] != nil {
 		err.Message = String(obj["message"].(string))
 	}
@@ -120,7 +161,7 @@ func (err *SDKError) ErrorMessage() *string {
 	return err.Message
 }
 
-func (err *SDKError) ErrorCode() *string {
+func (err *SDKError) GetCode() *string {
 	return err.Code
 }
 

dara/retry.go

@@ -273,12 +273,12 @@ func ShouldRetry(options *RetryOptions, ctx *RetryPolicyContext) bool {
 
 		for _, condition := range conditions {
 			for _, exc := range condition.Exception {
-				if exc == StringValue(baseErr.ErrorName()) {
+				if exc == StringValue(baseErr.GetName()) {
 					return false
 				}
 			}
 			for _, code := range condition.ErrorCode {
-				if code == StringValue(baseErr.ErrorCode()) {
+				if code == StringValue(baseErr.GetCode()) {
 					return false
 				}
 			}
@@ -287,7 +287,7 @@ func ShouldRetry(options *RetryOptions, ctx *RetryPolicyContext) bool {
 		conditions = options.RetryCondition
 		for _, condition := range conditions {
 			for _, exc := range condition.Exception {
-				if exc == StringValue(baseErr.ErrorName()) {
+				if exc == StringValue(baseErr.GetName()) {
 					if retriesAttempted >= condition.MaxAttempts {
 						return false
 					}
@@ -295,7 +295,7 @@ func ShouldRetry(options *RetryOptions, ctx *RetryPolicyContext) bool {
 				}
 			}
 			for _, code := range condition.ErrorCode {
-				if code == StringValue(baseErr.ErrorCode()) {
+				if code == StringValue(baseErr.GetCode()) {
 					if retriesAttempted >= condition.MaxAttempts {
 						return false
 					}
@@ -323,13 +323,13 @@ func GetBackoffDelay(options *RetryOptions, ctx *RetryPolicyContext) int {
 	if baseErr, ok := ex.(BaseError); ok {
 		for _, condition := range conditions {
 			for _, exc := range condition.Exception {
-				if exc == StringValue(baseErr.ErrorName()) {
+				if exc == StringValue(baseErr.GetName()) {
 					maxDelay := condition.MaxDelay
 					// Simulated "retryAfter" from an error response
 					if respErr, ok := ex.(ResponseError); ok {
-						retryAfter := IntValue(respErr.ErrorRetryAfter())
+						retryAfter := Int64Value(respErr.GetRetryAfter())
 						if retryAfter != 0 {
-							return min(retryAfter, maxDelay)
+							return min(int(retryAfter), maxDelay)
 						}
 					}
 					// This would be set properly based on your error handling
@@ -342,13 +342,13 @@ func GetBackoffDelay(options *RetryOptions, ctx *RetryPolicyContext) int {
 			}
 
 			for _, code := range condition.ErrorCode {
-				if code == StringValue(baseErr.ErrorCode()) {
+				if code == StringValue(baseErr.GetCode()) {
 					maxDelay := condition.MaxDelay
 					// Simulated "retryAfter" from an error response
 					if respErr, ok := ex.(ResponseError); ok {
-						retryAfter := IntValue(respErr.ErrorRetryAfter())
+						retryAfter := Int64Value(respErr.GetRetryAfter())
 						if retryAfter != 0 {
-							return min(retryAfter, maxDelay)
+							return min(int(retryAfter), maxDelay)
 						}
 					}
 

dara/retry_test.go

@@ -29,11 +29,11 @@ func (err *AErr) New(obj map[string]interface{}) *AErr {
 	return err
 }
 
-func (err *AErr) ErrorCode() *string {
+func (err *AErr) GetCode() *string {
 	return err.Code
 }
 
-func (err *AErr) ErrorName() *string {
+func (err *AErr) GetName() *string {
 	return err.Name
 }
 
@@ -59,11 +59,11 @@ func (err *BErr) New(obj map[string]interface{}) *BErr {
 	return err
 }
 
-func (err *BErr) ErrorCode() *string {
+func (err *BErr) GetCode() *string {
 	return err.Code
 }
 
-func (err *BErr) ErrorName() *string {
+func (err *BErr) GetName() *string {
 	return err.Name
 }
 
@@ -72,7 +72,7 @@ type CErr struct {
 	Code       *string
 	Name       *string
 	Message    *string
-	RetryAfter *int
+	RetryAfter *int64
 	StatusCode *int
 }
 
@@ -91,26 +91,26 @@ func (err *CErr) New(obj map[string]interface{}) *CErr {
 		err.StatusCode = Int(statusCode)
 	}
 
-	if retryAfter, ok := obj["RetryAfter"].(int); ok {
-		err.RetryAfter = Int(retryAfter)
+	if retryAfter, ok := obj["RetryAfter"].(int64); ok {
+		err.RetryAfter = Int64(retryAfter)
 	}
 
 	return err
 }
 
-func (err *CErr) ErrorCode() *string {
+func (err *CErr) GetCode() *string {
 	return err.Code
 }
 
-func (err *CErr) ErrorName() *string {
+func (err *CErr) GetName() *string {
 	return err.Name
 }
 
-func (err *CErr) ErrorRetryAfter() *int {
+func (err *CErr) GetRetryAfter() *int64 {
 	return err.RetryAfter
 }
 
-func (err *CErr) ErrorStatusCode() *int {
+func (err *CErr) GetStatusCode() *int {
 	return err.StatusCode
 }
 
@@ -584,7 +584,7 @@ func TestRetryAfter(t *testing.T) {
 		RetriesAttempted: 2,
 		Exception: new(CErr).New(map[string]interface{}{
 			"Code":       "CErr",
-			"RetryAfter": 3000,
+			"RetryAfter": int64(3000),
 		}),
 	}
 

dara/stream.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 	"strings"
+	"fmt"
 )
 
 // 定义 Event 结构体
@@ -14,24 +15,36 @@ type SSEEvent struct {
 	ID    *string
 	Event *string
 	Data  *string
+	Retry *int
 }
 
 // 解析单个事件
-func parseEvent(eventLines []string) *SSEEvent {
-	var event *SSEEvent
-	var data string
-	var id string
-
-	for _, line := range eventLines {
-		if strings.HasPrefix(line, "data:") {
-			data += strings.TrimPrefix(line, "data:") + "\n"
-		} else if strings.HasPrefix(line, "id:") {
-			id += strings.TrimPrefix(line, "data:") + "\n"
+func parseEvent(lines []string) *SSEEvent {
+	event := &SSEEvent{}
+	for _, line := range lines {
+		if strings.HasPrefix(line, "data: ") {
+			data := strings.TrimPrefix(line, "data: ") + "\n"
+			if event.Data == nil {
+				event.Data = new(string)
+			}
+			*event.Data += data
+		} else if strings.HasPrefix(line, "event: ") {
+			eventName := strings.TrimPrefix(line, "event: ")
+			event.Event = &eventName
+		} else if strings.HasPrefix(line, "id: ") {
+			id := strings.TrimPrefix(line, "id: ")
+			event.ID = &id
+		} else if strings.HasPrefix(line, "retry: ") {
+			var retry int
+			fmt.Sscanf(strings.TrimPrefix(line, "retry: "), "%d", &retry)
+			event.Retry = &retry
 		}
 	}
-
-	event.Data = String(data)
-	event.ID = String(id)
+	// Remove last newline from data
+	if event.Data != nil {
+		data := strings.TrimRight(*event.Data, "\n")
+		event.Data = &data
+	}
 	return event
 }
 
@@ -77,34 +90,48 @@ func ReadAsString(body io.Reader) (string, error) {
 	return string(byt), nil
 }
 
-func ReadAsSSE(body io.ReadCloser) (<-chan *SSEEvent, <-chan error) {
-	eventChannel := make(chan *SSEEvent)
+func ReadAsSSE(body io.ReadCloser, eventChannel chan *SSEEvent, errorChannel chan error) {
 
-	// 启动 Goroutine 解析 SSE 数据
 	go func() {
-		defer body.Close()
-		defer close(eventChannel)
-		var eventLines []string
+		defer func() {
+			body.Close()
+			close(eventChannel)
+		}()
 
 		reader := bufio.NewReader(body)
+		var eventLines []string
 
 		for {
 			line, err := reader.ReadString('\n')
 			if err != nil {
+				if err == io.EOF {
+					// Handle the end of the stream and possibly pending event
+					if len(eventLines) > 0 {
+						event := parseEvent(eventLines)
+						eventChannel <- event
+					}
+					errorChannel <- nil
+					return
+				}
+				errorChannel <- err
 				return
 			}
 
 			line = strings.TrimRight(line, "\n")
+
 			if line == "" {
+				// End of an SSE event
 				if len(eventLines) > 0 {
 					event := parseEvent(eventLines)
 					eventChannel <- event
-					eventLines = []string{}
+					eventLines = []string{} // Reset for the next event
 				}
 				continue
 			}
+
 			eventLines = append(eventLines, line)
 		}
 	}()
-	return eventChannel, nil
+
+	return
 }

internal/darafile/Darafile

@@ -0,0 +1,35 @@
+{
+  "scope": "darabonba",
+  "name": "HttpClient",
+  "version": "0.0.1",
+  "main": "./main.dara",
+  "maintainers": [
+    {
+      "name": "Alibaba Cloud SDK",
+      "email": "sdk-team@alibabacloud.com"
+    }
+  ],
+  "libraries": {
+  },
+  "releases": {
+    "go": "github.com/alibabacloud-go/tea/tea:v1.2.3-0.20240605082020-e6e537a31150"
+  },
+  "go": {
+    "interface": true,
+    "clientName": "HttpClient",
+    "typedef": {
+      "HttpRequest": {
+        "import": "net/http",
+        "type": "http.Request"
+      },
+      "HttpResponse": {
+        "import": "net/http",
+        "type": "http.Response"
+      },
+      "HttpTransport": {
+        "import": "net/http",
+        "type": "http.Transport"
+      }
+    }
+  }
+}

internal/darafile/main.dara

@@ -0,0 +1,8 @@
+typedef HttpRequest;
+typedef HttpResponse;
+typedef HttpTransport;
+
+init(){
+}
+
+async function call(request: HttpRequest, transport: HttpTransport): HttpResponse;

internal/darafilev2/Darafile

@@ -0,0 +1,35 @@
+{
+  "scope": "darabonba",
+  "name": "HttpClientV2",
+  "version": "0.0.1",
+  "main": "./main.dara",
+  "maintainers": [
+    {
+      "name": "Alibaba Cloud SDK",
+      "email": "sdk-team@alibabacloud.com"
+    }
+  ],
+  "libraries": {
+  },
+  "releases": {
+    "go": "github.com/alibabacloud-go/tea/dara:v1.3.5"
+  },
+  "go": {
+    "interface": true,
+    "clientName": "HttpClient",
+    "typedef": {
+      "HttpRequest": {
+        "import": "net/http",
+        "type": "http.Request"
+      },
+      "HttpResponse": {
+        "import": "net/http",
+        "type": "http.Response"
+      },
+      "HttpTransport": {
+        "import": "net/http",
+        "type": "http.Transport"
+      }
+    }
+  }
+}

internal/darafilev2/main.dara

@@ -0,0 +1,8 @@
+typedef HttpRequest;
+typedef HttpResponse;
+typedef HttpTransport;
+
+init(){
+}
+
+async function call(request: HttpRequest, transport: HttpTransport): HttpResponse;

tea/tea.go

@@ -31,7 +31,28 @@ import (
 
 var debugLog = debug.Init("tea")
 
-var hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
+type HttpRequest interface {
+}
+
+type HttpResponse interface {
+}
+
+type HttpClient interface {
+	Call(request *http.Request, transport *http.Transport) (response *http.Response, err error)
+}
+
+type teaClient struct {
+	sync.Mutex
+	httpClient *http.Client
+	ifInit     bool
+}
+
+func (client *teaClient) Call(request *http.Request, transport *http.Transport) (response *http.Response, err error) {
+	response, err = client.httpClient.Do(request)
+	return
+}
+
+var hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 	return fn
 }
 
@@ -97,12 +118,7 @@ type RuntimeObject struct {
 	Listener       utils.ProgressListener `json:"listener" xml:"listener"`
 	Tracker        *utils.ReaderTracker   `json:"tracker" xml:"tracker"`
 	Logger         *utils.Logger          `json:"logger" xml:"logger"`
-}
-
-type teaClient struct {
-	sync.Mutex
-	httpClient *http.Client
-	ifInit     bool
+	HttpClient
 }
 
 var clientPool = &sync.Map{}
@@ -143,6 +159,9 @@ func NewRuntimeObject(runtime map[string]interface{}) *RuntimeObject {
 	if runtime["logger"] != nil {
 		runtimeObject.Logger = runtime["logger"].(*utils.Logger)
 	}
+	if runtime["httpClient"] != nil {
+		runtimeObject.HttpClient = runtime["httpClient"].(HttpClient)
+	}
 	return runtimeObject
 }
 
@@ -351,18 +370,27 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons
 	}
 	httpRequest.Host = StringValue(request.Domain)
 
-	client := getTeaClient(runtimeObject.getClientTag(StringValue(request.Domain)))
-	client.Lock()
-	if !client.ifInit {
-		trans, err := getHttpTransport(request, runtimeObject)
-		if err != nil {
-			return nil, err
-		}
-		client.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
-		client.httpClient.Transport = trans
-		client.ifInit = true
+	var client HttpClient
+	if runtimeObject.HttpClient == nil {
+		client = getTeaClient(runtimeObject.getClientTag(StringValue(request.Domain)))
+	} else {
+		client = runtimeObject.HttpClient
 	}
-	client.Unlock()
+
+	trans, err := getHttpTransport(request, runtimeObject)
+	if err != nil {
+		return
+	}
+	if defaultClient, ok := client.(*teaClient); ok {
+		defaultClient.Lock()
+		if !defaultClient.ifInit || defaultClient.httpClient.Transport == nil {
+			defaultClient.httpClient.Transport = trans
+		}
+		defaultClient.httpClient.Timeout = time.Duration(IntValue(runtimeObject.ReadTimeout)) * time.Millisecond
+		defaultClient.ifInit = true
+		defaultClient.Unlock()
+	}
+
 	for key, value := range request.Headers {
 		if value == nil || key == "content-length" {
 			continue
@@ -384,7 +412,7 @@ func DoRequest(request *Request, requestRuntime map[string]interface{}) (respons
 	putMsgToMap(fieldMap, httpRequest)
 	startTime := time.Now()
 	fieldMap["{start_time}"] = startTime.Format("2006-01-02 15:04:05")
-	res, err := hookDo(client.httpClient.Do)(httpRequest)
+	res, err := hookDo(client.Call)(httpRequest, trans)
 	fieldMap["{cost}"] = time.Since(startTime).String()
 	completedBytes := int64(0)
 	if runtimeObject.Tracker != nil {

tea/tea_test.go

@@ -487,11 +487,36 @@ func Test_GetBackoffTime(t *testing.T) {
 	utils.AssertEqual(t, true, IntValue(ms) <= 3)
 }
 
+type httpClient struct {
+	HttpClient
+	httpClient *http.Client
+}
+
+func newHttpClient() (*httpClient, error) {
+	client := new(httpClient)
+	err := client.Init()
+	return client, err
+}
+
+func (client *httpClient) Init() (_err error) {
+	return nil
+}
+
+func (client *httpClient) Call(request *http.Request, transport *http.Transport) (_result *http.Response, _err error) {
+	if transport != nil {
+		trans := transport.Clone()
+		client.httpClient.Transport = trans
+	} else {
+		client.httpClient.Transport = http.DefaultTransport.(*http.Transport).Clone()
+	}
+	return client.httpClient.Do(request)
+}
+
 func Test_DoRequest(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
 	}
@@ -530,8 +555,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, resp)
 	utils.AssertContains(t, err.Error(), ` invalid URL escape "%gf"`)
 
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -579,8 +604,8 @@ func Test_DoRequest(t *testing.T) {
 	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", StringValue(resp.Headers["tea"]))
 
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			utils.AssertEqual(t, "tea-cn-hangzhou.aliyuncs.com:1080", req.Host)
 			return mockResponse(200, ``, errors.New("Internal error"))
 		}
@@ -592,13 +617,20 @@ func Test_DoRequest(t *testing.T) {
 	resp, err = DoRequest(request, runtimeObj)
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, `Internal error`, err.Error())
+
+	httpClient, err := newHttpClient()
+	utils.AssertNil(t, err)
+	runtimeObj["httpClient"] = httpClient
+	resp, err = DoRequest(request, runtimeObj)
+	utils.AssertNil(t, resp)
+	utils.AssertEqual(t, `Internal error`, err.Error())
 }
 
 func Test_DoRequestWithConcurrent(t *testing.T) {
 	origTestHookDo := hookDo
 	defer func() { hookDo = origTestHookDo }()
-	hookDo = func(fn func(req *http.Request) (*http.Response, error)) func(req *http.Request) (*http.Response, error) {
-		return func(req *http.Request) (*http.Response, error) {
+	hookDo = func(fn func(req *http.Request, transport *http.Transport) (*http.Response, error)) func(req *http.Request, transport *http.Transport) (*http.Response, error) {
+		return func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 			return mockResponse(200, ``, nil)
 		}
 	}
@@ -694,11 +726,11 @@ func Test_SetDialContext(t *testing.T) {
 }
 
 func Test_hookdo(t *testing.T) {
-	fn := func(req *http.Request) (*http.Response, error) {
+	fn := func(req *http.Request, transport *http.Transport) (*http.Response, error) {
 		return nil, errors.New("hookdo")
 	}
 	result := hookDo(fn)
-	resp, err := result(nil)
+	resp, err := result(nil, nil)
 	utils.AssertNil(t, resp)
 	utils.AssertEqual(t, "hookdo", err.Error())
 }