Merge branch 'master' into compatible-sdk-error

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"
 )
@@ -202,7 +202,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)
@@ -429,6 +429,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

@@ -735,6 +735,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

@@ -4,21 +4,23 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/alibabacloud-go/tea/tea"
 	"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
 }
 
 // SDKError struct is used save error code and message
@@ -40,6 +42,42 @@ type CastError struct {
 	Message *string
 }
 
+func TeaSDKError(err error) *tea.SDKError {
+	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(),
+		})
+	}
+
+	if baseErr, ok := err.(BaseError); ok {
+		return tea.NewSDKError(map[string]interface{}{
+			"code":    StringValue(baseErr.GetCode()),
+			"message": baseErr.Error(),
+		})
+	}
+
+	return tea.NewSDKError(map[string]interface{}{
+		"message": err.Error(),
+	})
+}
+
 // NewSDKError is used for shortly create SDKError object
 func NewSDKError(obj map[string]interface{}) *SDKError {
 	err := &SDKError{}
@@ -120,7 +158,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

@@ -4,9 +4,11 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"strings"
+	"fmt"
 )
 
 // 定义 Event 结构体
@@ -14,24 +16,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 +91,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
 }