Expose error code and message.

Author: deadblue

internal/protocol/basic.go

@@ -27,23 +27,17 @@ func (r *BasicResp) Err() error {
 	if r.State {
 		return nil
 	}
-	errCode := findNonZero(
+	return errors.Get(util.NonZero(
 		r.ErrorCode.Int(),
 		r.ErrorCode2,
 		r.ErrorCode3,
 		r.ErrorCode4,
 		r.ErrorCode5,
-	)
-	return errors.Get(errCode)
-}
-
-func findNonZero(code ...int) int {
-	for _, c := range code {
-		if c != 0 {
-			return c
-		}
-	}
-	return 0
+	), util.NonEmptyString(
+		r.ErrorMessage,
+		r.ErrorMessage2,
+		r.ErrorMessage3,
+	))
 }
 
 // StandardResp is the response for all JSON/JSONP APIs with "data" field.

internal/protocol/qrcode.go

@@ -3,6 +3,7 @@ package protocol
 import (
 	"encoding/json"
 
+	"github.com/deadblue/elevengo/internal/util"
 	"github.com/deadblue/elevengo/lowlevel/errors"
 )
 
@@ -21,7 +22,9 @@ func (r *QrcodeBaseResp) Err() error {
 	if r.State != 0 {
 		return nil
 	}
-	return errors.Get(r.ErrorCode1)
+	return errors.Get(r.ErrorCode1, util.NonEmptyString(
+		r.ErrorMessage1, r.ErrorMessage2,
+	))
 }
 
 func (r *QrcodeBaseResp) Extract(v any) error {

internal/util/value.go

@@ -0,0 +1,19 @@
+package util
+
+func NonZero(number ...int) int {
+	for _, n := range number {
+		if n != 0 {
+			return n
+		}
+	}
+	return 0
+}
+
+func NonEmptyString(str ...string) string {
+	for _, s := range str {
+		if s != "" {
+			return s
+		}
+	}
+	return ""
+}

lowlevel/errors/get.go

@@ -1,12 +1,14 @@
 package errors
 
+import "fmt"
+
 var errorsMap = map[int]error{
 	// Normal errors
 	99:     ErrNotLogin,
 	911:    ErrCaptchaRequired,
 	990001: ErrNotLogin,
 	// Offline errors
-	10004: ErrOfflineInvalidLink,
+	CodeOfflineIllegalLink: ErrOfflineInvalidLink,
 	// File errors
 	20004: ErrExist,
 	20022: ErrInvalidOperation,
@@ -29,9 +31,21 @@ var errorsMap = map[int]error{
 	CodeOfflineTaskExists: nil,
 }
 
-func Get(code int) error {
+type ApiError struct {
+	Code    int
+	Message string
+}
+
+func (e *ApiError) Error() string {
+	return fmt.Sprintf("(%d)%s", e.Code, e.Message)
+}
+
+func Get(code int, message string) error {
 	if err, found := errorsMap[code]; found {
 		return err
 	}
-	return ErrUnexpected
+	return &ApiError{
+		Code:    code,
+		Message: message,
+	}
 }