binary data request add content length

Author: YangSen-qn

internal/api-generator/client.go

@@ -151,18 +151,6 @@ func (description *ApiDetailedDescription) generatePackage(group *jen.Group, opt
 							))
 						}))
 				}
-				if description.Request.HeaderNames != nil {
-					group.Add(
-						jen.List(jen.Id("headers"), jen.Err()).Op(":=").Id("innerRequest").Dot("buildHeaders").Call(),
-					)
-					group.Add(
-						jen.If(
-							jen.Err().Op("!=").Nil(),
-						).BlockFunc(func(group *jen.Group) {
-							group.Add(jen.Return(jen.Nil(), jen.Err()))
-						}),
-					)
-				}
 				guessPathSegmentsCount := 0
 				if description.BasePath != "" {
 					guessPathSegmentsCount += len(description.getBasePathSegments())
@@ -243,6 +231,22 @@ func (description *ApiDetailedDescription) generatePackage(group *jen.Group, opt
 						}),
 					)
 				}
+				if description.Request.HeaderNames != nil {
+					group.Add(
+						jen.List(jen.Id("headers"), jen.Err()).Op(":=").Id("innerRequest").Dot("buildHeaders").Call(),
+					)
+					group.Add(
+						jen.If(
+							jen.Err().Op("!=").Nil(),
+						).BlockFunc(func(group *jen.Group) {
+							group.Add(jen.Return(jen.Nil(), jen.Err()))
+						}),
+					)
+				} else {
+					group.Add(
+						jen.Id("headers").Op(":=").Qual("net/http", "Header").Values(jen.Dict{}),
+					)
+				}
 				if requestBody := description.Request.Body; requestBody != nil {
 					if json := requestBody.Json; json != nil {
 						group.Add(
@@ -301,6 +305,16 @@ func (description *ApiDetailedDescription) generatePackage(group *jen.Group, opt
 									))
 								}),
 						)
+						group.Add(
+							jen.Id("hErr").Op(":=").Qual(PackageNameUtils, "HttpHeadAddContentLength").Call(jen.Id("headers"), jen.Id("body")),
+						)
+						group.Add(
+							jen.If(
+								jen.Id("hErr").Op("!=").Nil(),
+							).Block(
+								jen.Return(jen.Nil(), jen.Id("hErr")),
+							),
+						)
 					}
 				}
 				if isStorageAPIs() {
@@ -405,9 +419,7 @@ func (description *ApiDetailedDescription) generatePackage(group *jen.Group, opt
 							group.Add(jen.Id("Endpoints").Op(":").Id("options").Dot("OverwrittenEndpoints"))
 							group.Add(jen.Id("Region").Op(":").Id("options").Dot("OverwrittenRegion"))
 							group.Add(jen.Id("Interceptors").Op(":").Index().Qual(PackageNameHTTPClient, "Interceptor").Values(jen.Id("uplogInterceptor")))
-							if description.Request.HeaderNames != nil {
-								group.Add(jen.Id("Header").Op(":").Id("headers"))
-							}
+							group.Add(jen.Id("Header").Op(":").Id("headers"))
 							switch description.Request.Authorization.ToAuthorization() {
 							case AuthorizationQbox:
 								group.Add(jen.Id("AuthType").Op(":").Qual(PackageNameAuth, "TokenQBox"))

internal/api-generator/main.go

@@ -19,6 +19,7 @@ const (
 	PackageNameRegion      = "github.com/qiniu/go-sdk/v7/storagev2/region"
 	PackageNameUpToken     = "github.com/qiniu/go-sdk/v7/storagev2/uptoken"
 	PackageNameErrors      = "github.com/qiniu/go-sdk/v7/storagev2/errors"
+	PackageNameUtils       = "github.com/qiniu/go-sdk/v7/storagev2/internal/utils"
 	PackageNameUplog       = "github.com/qiniu/go-sdk/v7/internal/uplog"
 	PackageNameInternalIo  = "github.com/qiniu/go-sdk/v7/internal/io"
 )

storagev2/internal/utils/http.go

@@ -0,0 +1,23 @@
+package utils
+
+import (
+	"io"
+	"net/http"
+	"strconv"
+)
+
+func HttpHeadAddContentLength(header http.Header, data io.ReadSeekCloser) error {
+	_, err := data.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+
+	contentLength, err := data.Seek(0, io.SeekEnd)
+	if err != nil {
+		return err
+	}
+
+	header.Set("Content-Length", strconv.FormatInt(contentLength, 10))
+
+	return nil
+}

storagev2/internal/utils/http_test.go

@@ -0,0 +1,71 @@
+package utils
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"net/http"
+	"testing"
+
+	internal_io "github.com/qiniu/go-sdk/v7/internal/io"
+)
+
+// 模拟 io.ReadSeekCloser 以模拟错误
+type errorSeeker struct {
+	io.ReadSeeker
+	err error
+}
+
+func (e *errorSeeker) Close() error {
+	return nil
+}
+
+func (e *errorSeeker) Seek(offset int64, whence int) (int64, error) {
+	if e.err != nil {
+		return 0, e.err
+	}
+	return e.ReadSeeker.Seek(offset, whence)
+}
+
+func TestHttpHeadAddContentLength_Success(t *testing.T) {
+	data := bytes.NewReader([]byte("test"))
+	dataS := internal_io.MakeReadSeekCloserFromLimitedReader(data, data.Size())
+
+	header := http.Header{}
+	err := HttpHeadAddContentLength(header, dataS)
+	if err != nil {
+		t.Errorf("Expected no error, got %v", err)
+	}
+
+	expectedLength := "4"
+	actualLength := header.Get("Content-Length")
+	if actualLength != expectedLength {
+		t.Errorf("Expected Content-Length to be %s, got %s", expectedLength, actualLength)
+	}
+}
+
+func TestHttpHeadAddContentLength_SeekStartError(t *testing.T) {
+	header := http.Header{}
+	data := &errorSeeker{
+		ReadSeeker: bytes.NewReader([]byte("test")),
+		err:        errors.New("seek start error"),
+	}
+
+	err := HttpHeadAddContentLength(header, data)
+	if err == nil {
+		t.Errorf("Expected error, got nil")
+	}
+}
+
+func TestHttpHeadAddContentLength_SeekEndError(t *testing.T) {
+	header := http.Header{}
+	data := &errorSeeker{
+		ReadSeeker: bytes.NewReader([]byte("test")),
+		err:        errors.New("seek end error"),
+	}
+
+	err := HttpHeadAddContentLength(header, data)
+	if err == nil {
+		t.Errorf("Expected error, got nil")
+	}
+}