Merge pull request #58 from deadblue/develop

Bump version to 0.7.7.

Author: deadblue

internal/impl/api.go

@@ -41,7 +41,7 @@ func (c *ClientImpl) internalCall(
 	defer c.v.ClockIn()
 	// Prepare request
 	if payload != nil {
-		body, err = c.post(url, payload, context)
+		body, err = c.Post(url, payload, nil, context)
 	} else {
 		body, err = c.Get(url, nil, context)
 	}

internal/impl/body.go

@@ -5,8 +5,7 @@ import "io"
 type _BodyImpl struct {
 	rc io.ReadCloser
 
-	size  int64
-	total int64
+	size int64
 }
 
 func (i *_BodyImpl) Read(p []byte) (int, error) {
@@ -20,7 +19,3 @@ func (i *_BodyImpl) Close() error {
 func (i *_BodyImpl) Size() int64 {
 	return i.size
 }
-
-func (i *_BodyImpl) TotalSize() int64 {
-	return i.total
-}

internal/impl/common.go

@@ -2,10 +2,8 @@ package impl
 
 import (
 	"context"
-	"io"
 	"net"
 	"net/http"
-	"strings"
 
 	"github.com/deadblue/elevengo/internal/util"
 	"github.com/deadblue/elevengo/lowlevel/client"
@@ -47,19 +45,25 @@ func (c *ClientImpl) send(req *http.Request) (resp *http.Response, err error) {
 	return
 }
 
-// |post| performs an HTTP POST request to specific URL with given payload.
-func (c *ClientImpl) post(url string, payload client.Payload, context context.Context) (body io.ReadCloser, err error) {
+func (c *ClientImpl) Post(
+	url string, payload client.Payload, headers map[string]string, context context.Context,
+) (body client.Body, err error) {
 	req, err := http.NewRequestWithContext(context, http.MethodPost, url, payload)
 	if err != nil {
 		return
 	}
+	if len(headers) > 0 {
+		for name, value := range headers {
+			req.Header.Add(name, value)
+		}
+	}
 	req.Header.Set(headerContentType, payload.ContentType())
 	if size := payload.ContentLength(); size > 0 {
 		req.ContentLength = size
 	}
 	var resp *http.Response
 	if resp, err = c.send(req); err == nil {
-		body = resp.Body
+		body = makeClientBody(resp)
 	}
 	return
 }
@@ -76,22 +80,19 @@ func (c *ClientImpl) Get(
 			req.Header.Add(name, value)
 		}
 	}
-	resp, err := c.send(req)
-	if err == nil {
-		bi := &_BodyImpl{
-			rc:    resp.Body,
-			size:  -1,
-			total: -1,
-		}
-		if hv := resp.Header.Get("Content-Length"); hv != "" {
-			bi.size = util.ParseInt64(hv, -1)
-		}
-		if hv := resp.Header.Get("Content-Range"); hv != "" {
-			if index := strings.LastIndex(hv, "/"); index >= 0 {
-				bi.total = util.ParseInt64(hv[index+1:], -1)
-			}
-		}
-		body = bi
+	if resp, err := c.send(req); err == nil {
+		body = makeClientBody(resp)
 	}
 	return
 }
+
+func makeClientBody(resp *http.Response) client.Body {
+	body := &_BodyImpl{
+		rc:   resp.Body,
+		size: -1,
+	}
+	if hv := resp.Header.Get("Content-Length"); hv != "" {
+		body.size = util.ParseInt64(hv, -1)
+	}
+	return body
+}

internal/protocol/cookie.go

@@ -7,8 +7,8 @@ const (
 
 	CookieNameUID  = "UID"
 	CookieNameCID  = "CID"
-	CookieNameSEID = "SEID"
 	CookieNameKID  = "KID"
+	CookieNameSEID = "SEID"
 )
 
 var (

lowlevel/client/client.go

@@ -13,9 +13,16 @@ type Client interface {
 	// ExportCookies exports cookies for specific URL.
 	ExportCookies(url string) map[string]string
 
-	// Get performs an HTTP GET request.
-	Get(url string, headers map[string]string, context context.Context) (body Body, err error)
-
 	// CallApi calls an API.
 	CallApi(spec ApiSpec, context context.Context) error
+
+	// Get performs an HTTP GET request.
+	Get(
+		url string, headers map[string]string, context context.Context,
+	) (body Body, err error)
+
+	// Post performs an HTTP POST request.
+	Post(
+		url string, payload Payload, headers map[string]string, context context.Context,
+	) (body Body, err error)
 }

lowlevel/client/types.go

@@ -38,8 +38,5 @@ type (
 
 		// Size returns body size or -1 when unknown.
 		Size() int64
-
-		// TotalSize returns total size of remote content or -1 when unknown.
-		TotalSize() int64
 	}
 )

lowlevel/errors/errors.go

@@ -9,13 +9,15 @@ var (
 
 	ErrOfflineInvalidLink = errors.New("invalid download link")
 
+	ErrIPAbnormal           = errors.New("ip abnormal")
 	ErrPasswordIncorrect    = errors.New("password incorrect")
 	ErrLoginTwoStepVerify   = errors.New("requires two-step verification")
 	ErrAccountNotBindMobile = errors.New("account not binds mobile")
 	ErrCredentialInvalid    = errors.New("credential invalid")
 	ErrSessionExited        = errors.New("session exited")
 
 	ErrQrcodeExpired = errors.New("qrcode expired")
+	ErrGetFailed     = errors.New("get failed")
 
 	// ErrUnexpected is the fall-back error whose code is not handled.
 	ErrUnexpected = errors.New("unexpected error")

lowlevel/errors/get.go

@@ -19,13 +19,15 @@ var errorsMap = map[int]error{
 	// Common errors
 	990002: ErrInvalidParameters,
 	// Login errors
+	40101004: ErrIPAbnormal,
 	40101009: ErrPasswordIncorrect,
 	40101010: ErrLoginTwoStepVerify,
 	40101030: ErrAccountNotBindMobile,
 	40101032: ErrCredentialInvalid,
 	40101037: ErrSessionExited,
 	// QRCode errors
 	40199002: ErrQrcodeExpired,
+	50199004: ErrGetFailed,
 
 	// Whitelist errors
 	CodeOfflineTaskExists: nil,

version.go

@@ -7,7 +7,7 @@ import (
 
 const (
 	libName = "elevengo"
-	libVer  = "0.7.6"
+	libVer  = "0.7.7"
 )
 
 var (