refactor!: migrate from ProtonMail/resty fork to upstream resty/v2

attachment.go

@@ -56,19 +56,19 @@ func (c *Client) UploadAttachment(ctx context.Context, addrKR *crypto.KeyRing, r
 					Param:       "KeyPackets",
 					FileName:    "blob",
 					ContentType: "application/octet-stream",
-					Stream:      resty.NewByteMultipartStream(enc.KeyPacket),
+					Reader:      bytes.NewReader(enc.KeyPacket),
 				},
 				&resty.MultipartField{
 					Param:       "DataPacket",
 					FileName:    "blob",
 					ContentType: "application/octet-stream",
-					Stream:      resty.NewByteMultipartStream(enc.DataPacket),
+					Reader:      bytes.NewReader(enc.DataPacket),
 				},
 				&resty.MultipartField{
 					Param:       "Signature",
 					FileName:    "blob",
 					ContentType: "application/octet-stream",
-					Stream:      resty.NewByteMultipartStream(sig.GetBinary()),
+					Reader:      bytes.NewReader(sig.GetBinary()),
 				},
 			).
 			Post("/mail/v4/attachments")

block.go

@@ -32,7 +32,7 @@ func (c *Client) RequestBlockUpload(ctx context.Context, req BlockUploadReq) ([]
 	return res.UploadLinks, nil
 }
 
-func (c *Client) UploadBlock(ctx context.Context, bareURL, token string, block resty.MultiPartStream) error {
+func (c *Client) UploadBlock(ctx context.Context, bareURL, token string, block io.ReadSeeker) error {
 	return c.do(ctx, func(r *resty.Request) (*resty.Response, error) {
 		return r.
 			SetHeader("pm-storage-token", token).

go.mod

@@ -70,5 +70,3 @@ require (
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/go-resty/resty/v2 => github.com/ProtonMail/resty/v2 v2.0.0-20250929142426-e3dc6308c80b

go.sum

@@ -14,8 +14,6 @@ github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1J
 github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk=
 github.com/ProtonMail/gopenpgp/v2 v2.10.0-proton h1:d9EdXObucN2CNY1XGONJQH0+5q0q1+zTdxPhdF70C6w=
 github.com/ProtonMail/gopenpgp/v2 v2.10.0-proton/go.mod h1:B6khh1WJnEJyjXk6b2FR7RfNoPGqPqvvnD3EqBMs5LI=
-github.com/ProtonMail/resty/v2 v2.0.0-20250929142426-e3dc6308c80b h1:0GYNP0odNPJFn1fbfwthcYPd3it0AVntvSaCjh2nlaE=
-github.com/ProtonMail/resty/v2 v2.0.0-20250929142426-e3dc6308c80b/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/PuerkitoBio/goquery v1.12.0 h1:pAcL4g3WRXekcB9AU/y1mbKez2dbY2AajVhtkO8RIBo=
 github.com/PuerkitoBio/goquery v1.12.0/go.mod h1:802ej+gV2y7bbIhOIoPY5sT183ZW0YFofScC4q/hIpQ=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
@@ -67,6 +65,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=
 github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
+github.com/go-resty/resty/v2 v2.17.2 h1:FQW5oHYcIlkCNrMD2lloGScxcHJ0gkjshV3qcQAyHQk=
+github.com/go-resty/resty/v2 v2.17.2/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
@@ -158,7 +158,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
@@ -178,7 +177,6 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
@@ -203,7 +201,6 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -216,7 +213,6 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
@@ -232,8 +228,8 @@ golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
 golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

manager_builder.go

@@ -86,6 +86,7 @@ func (builder *managerBuilder) build() *Manager {
 
 	// Configure retry mechanism.
 	m.rc.SetRetryCount(builder.retryCount)
+	m.rc.SetRetryResetReaders(true)
 	m.rc.SetRetryMaxWaitTime(time.Minute)
 	m.rc.AddRetryCondition(catchTooManyRequests)
 	m.rc.AddRetryCondition(catchDialError)

manager_report.go

@@ -1,6 +1,7 @@
 package proton
 
 import (
+	"bytes"
 	"context"
 
 	"github.com/go-resty/resty/v2"
@@ -10,7 +11,7 @@ func (m *Manager) ReportBug(ctx context.Context, req ReportBugReq, atts ...Repor
 	r := m.r(ctx).SetMultipartFormData(req.toFormData())
 
 	for _, att := range atts {
-		r = r.SetMultipartField(att.Name, att.Filename, string(att.MIMEType), resty.NewByteMultipartStream(att.Body))
+		r = r.SetMultipartField(att.Name, att.Filename, string(att.MIMEType), bytes.NewReader(att.Body))
 	}
 	var res ReportBugRes
 
@@ -28,7 +29,7 @@ func (m *Manager) ReportBugAttachement(ctx context.Context, req ReportBugAttachm
 	r := m.r(ctx).SetMultipartFormData(req.toFormData())
 
 	for _, att := range atts {
-		r = r.SetMultipartField(att.Name, att.Filename, string(att.MIMEType), resty.NewByteMultipartStream(att.Body))
+		r = r.SetMultipartField(att.Name, att.Filename, string(att.MIMEType), bytes.NewReader(att.Body))
 	}
 
 	if _, err := r.Post("/core/v4/reports/bug/attachments"); err != nil {

message_import_types.go

@@ -1,6 +1,7 @@
 package proton
 
 import (
+	"bytes"
 	"encoding/json"
 
 	"github.com/ProtonMail/gluon/rfc822"
@@ -47,7 +48,7 @@ func buildImportReqFields(req []namedImportReq) ([]*resty.MultipartField, error)
 			Param:       req.Name,
 			FileName:    req.Name + ".eml",
 			ContentType: string(rfc822.MessageRFC822),
-			Stream:      resty.NewByteMultipartStream(append(req.encryptedMessage, "\r\n"...)),
+			Reader:      bytes.NewReader(append(req.encryptedMessage, "\r\n"...)),
 		})
 	}
 
@@ -59,7 +60,7 @@ func buildImportReqFields(req []namedImportReq) ([]*resty.MultipartField, error)
 	fields = append(fields, &resty.MultipartField{
 		Param:       "Metadata",
 		ContentType: "application/json",
-		Stream:      resty.NewByteMultipartStream(b),
+		Reader:      bytes.NewReader(b),
 	})
 
 	return fields, nil

multipart_retry_test.go

@@ -0,0 +1,152 @@
+package proton_test
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"mime"
+	"mime/multipart"
+	"net/http"
+	"sync"
+	"testing"
+
+	"github.com/ProtonMail/go-proton-api"
+	"github.com/ProtonMail/go-proton-api/server"
+	"github.com/stretchr/testify/require"
+)
+
+type retryTestTransport struct {
+	mu       sync.Mutex
+	attempts map[string]int
+	path     string
+}
+
+func newRetryTestTransport(path string) *retryTestTransport {
+	return &retryTestTransport{
+		attempts: make(map[string]int),
+		path:     path,
+	}
+}
+
+func (t *retryTestTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	t.mu.Lock()
+	key := req.URL.Path + req.URL.RawQuery
+	t.attempts[key]++
+	attempt := t.attempts[key]
+	t.mu.Unlock()
+
+	if attempt == 1 {
+		return &http.Response{
+			StatusCode: http.StatusTooManyRequests,
+			Header:     http.Header{"Retry-After": []string{"0"}},
+			Body:       io.NopCloser(bytes.NewReader([]byte("rate limited"))),
+		}, nil
+	}
+
+	return proton.InsecureTransport().RoundTrip(req)
+}
+
+func (t *retryTestTransport) AttemptCount(path string) int {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return t.attempts[path]
+}
+
+func TestReportBugMultipartRetryWithAttachment(t *testing.T) {
+	s := server.New()
+	defer s.Close()
+
+	originalBody := []byte("this is a non-trivial test attachment body that is definitely longer than a few bytes and contains various characters to ensure byte-accurate comparison works correctly 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()[]{}|;':\",./<>?`~")
+
+	var capturedServerCalls []server.Call
+	s.AddCallWatcher(func(call server.Call) {
+		capturedServerCalls = append(capturedServerCalls, call)
+	})
+
+	transport := newRetryTestTransport("/core/v4/reports/bug")
+
+	m := proton.New(
+		proton.WithHostURL(s.GetHostURL()),
+		proton.WithTransport(transport),
+		proton.WithRetryCount(3),
+	)
+	defer m.Close()
+
+	_, err := m.ReportBug(context.Background(), proton.ReportBugReq{
+		OS:         "linux",
+		OSVersion:  "5.4.0-42-generic",
+		Browser:    "firefox",
+		ClientType: proton.ClientTypeEmail,
+	}, proton.ReportBugAttachment{
+		Name:     "test-attachment",
+		Filename: "test.txt",
+		MIMEType: "text/plain",
+		Body:     originalBody,
+	})
+	require.NoError(t, err)
+
+	require.Len(t, capturedServerCalls, 1, "expected exactly 1 call to server (the retry)")
+	require.Equal(t, http.StatusOK, capturedServerCalls[0].Status)
+
+	require.Equal(t, 2, transport.AttemptCount("/core/v4/reports/bug"), "expected exactly 2 attempts through transport: one 429, one success")
+
+	form, err := multipart.NewReader(
+		bytes.NewReader(capturedServerCalls[0].RequestBody),
+		mustParseBoundary(t, capturedServerCalls[0].RequestHeader.Get("Content-Type")),
+	).ReadForm(0)
+	require.NoError(t, err, "failed to parse multipart form from retry body")
+
+	require.Contains(t, form.File, "test-attachment", "attachment field missing from retry body")
+	attachmentFile, err := form.File["test-attachment"][0].Open()
+	require.NoError(t, err)
+	attachmentBody, err := io.ReadAll(attachmentFile)
+	require.NoError(t, attachmentFile.Close())
+	require.NoError(t, err)
+
+	require.Equal(t, originalBody, attachmentBody, "attachment body mismatch on retry: SetRetryResetReaders did not properly reset the reader")
+}
+
+func mustParseBoundary(t *testing.T, contentType string) string {
+	_, params, err := mime.ParseMediaType(contentType)
+	require.NoError(t, err, "failed to parse Content-Type")
+	boundary, ok := params["boundary"]
+	require.True(t, ok, "Content-Type missing boundary")
+	return boundary
+}
+
+func TestReportBugMultipart(t *testing.T) {
+	s := server.New()
+	defer s.Close()
+
+	m := proton.New(
+		proton.WithHostURL(s.GetHostURL()),
+		proton.WithTransport(proton.InsecureTransport()),
+	)
+	defer m.Close()
+
+	var calls []server.Call
+
+	s.AddCallWatcher(func(call server.Call) {
+		calls = append(calls, call)
+	})
+
+	_, err := m.ReportBug(context.Background(), proton.ReportBugReq{
+		OS:         "linux",
+		OSVersion:  "5.4.0-42-generic",
+		Browser:    "firefox",
+		ClientType: proton.ClientTypeEmail,
+	})
+	require.NoError(t, err)
+
+	require.Len(t, calls, 1, "expected exactly 1 call (no retries)")
+
+	mimeType, mimeParams, err := mime.ParseMediaType(calls[0].RequestHeader.Get("Content-Type"))
+	require.NoError(t, err)
+	require.Equal(t, "multipart/form-data", mimeType)
+
+	form, err := multipart.NewReader(bytes.NewReader(calls[0].RequestBody), mimeParams["boundary"]).ReadForm(0)
+	require.NoError(t, err)
+
+	require.Len(t, form.Value, 5)
+	require.Equal(t, "linux", form.Value["OS"][0])
+}