fix 301 response missing Location header error

This commit is contained in:
eatMoreApple 2021-05-14 00:11:29 +08:00
parent 15855ca0f2
commit 4fa5d04fb4
2 changed files with 243 additions and 237 deletions

478
caller.go
View File

@ -1,351 +1,355 @@
package openwechat package openwechat
import ( import (
"errors" "errors"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
) )
// 调用请求和解析请求 // 调用请求和解析请求
// 上层模块可以直接获取封装后的请求结果 // 上层模块可以直接获取封装后的请求结果
type Caller struct { type Caller struct {
Client *Client Client *Client
path *url.URL path *url.URL
} }
// Constructor for Caller // Constructor for Caller
func NewCaller(client *Client) *Caller { func NewCaller(client *Client) *Caller {
return &Caller{Client: client} return &Caller{Client: client}
} }
// Default Constructor for Caller // Default Constructor for Caller
func DefaultCaller() *Caller { func DefaultCaller() *Caller {
return NewCaller(DefaultClient()) return NewCaller(DefaultClient())
} }
// 获取登录的uuid // 获取登录的uuid
func (c *Caller) GetLoginUUID() (string, error) { func (c *Caller) GetLoginUUID() (string, error) {
resp := NewReturnResponse(c.Client.GetLoginUUID()) resp := NewReturnResponse(c.Client.GetLoginUUID())
if resp.Err() != nil { if resp.Err() != nil {
return "", resp.Err() return "", resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := resp.ReadAll() data, err := resp.ReadAll()
if err != nil { if err != nil {
return "", err return "", err
} }
// 正则匹配uuid字符串 // 正则匹配uuid字符串
results := uuidRegexp.FindSubmatch(data) results := uuidRegexp.FindSubmatch(data)
if len(results) != 2 { if len(results) != 2 {
// 如果没有匹配到,可能微信的接口做了修改或者当前机器的ip被加入了黑名单 // 如果没有匹配到,可能微信的接口做了修改或者当前机器的ip被加入了黑名单
return "", errors.New("uuid does not match") return "", errors.New("uuid does not match")
} }
return string(results[1]), nil return string(results[1]), nil
} }
// 检查是否登录成功 // 检查是否登录成功
func (c *Caller) CheckLogin(uuid string) (*CheckLoginResponse, error) { func (c *Caller) CheckLogin(uuid string) (*CheckLoginResponse, error) {
resp := NewReturnResponse(c.Client.CheckLogin(uuid)) resp := NewReturnResponse(c.Client.CheckLogin(uuid))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := resp.ReadAll() data, err := resp.ReadAll()
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 正则匹配检测的code // 正则匹配检测的code
// 具体code参考global.go // 具体code参考global.go
results := statusCodeRegexp.FindSubmatch(data) results := statusCodeRegexp.FindSubmatch(data)
if len(results) != 2 { if len(results) != 2 {
return nil, errors.New("error status code match") return nil, errors.New("error status code match")
} }
code := string(results[1]) code := string(results[1])
return &CheckLoginResponse{Code: code, Raw: data}, nil return &CheckLoginResponse{Code: code, Raw: data}, nil
} }
// 获取登录信息 // 获取登录信息
func (c *Caller) GetLoginInfo(body []byte) (*LoginInfo, error) { func (c *Caller) GetLoginInfo(body []byte) (*LoginInfo, error) {
// 从响应体里面获取需要跳转的url // 从响应体里面获取需要跳转的url
results := redirectUriRegexp.FindSubmatch(body) results := redirectUriRegexp.FindSubmatch(body)
if len(results) != 2 { if len(results) != 2 {
return nil, errors.New("redirect url does not match") return nil, errors.New("redirect url does not match")
} }
path, err := url.Parse(string(results[1])) path, err := url.Parse(string(results[1]))
if err != nil { if err != nil {
return nil, err return nil, err
} }
domain, err := getDomainByHost(path.Host) domain, err := getDomainByHost(path.Host)
if err != nil { if err != nil {
return nil, err return nil, err
} }
c.Client.domain = domain c.Client.domain = domain
resp := NewReturnResponse(c.Client.GetLoginInfo(path.String())) resp := NewReturnResponse(c.Client.GetLoginInfo(path.String()))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() uErr, ok := resp.Err().(*url.Error)
} if ok && (uErr.Err.Error() == missLocationHeader.Error()) {
defer resp.Body.Close() return nil, loginForbiddenError
var loginInfo LoginInfo }
// xml结构体序列化储存 return nil, resp.Err()
if err := resp.ScanXML(&loginInfo); err != nil { }
return nil, err defer resp.Body.Close()
} var loginInfo LoginInfo
if !loginInfo.Ok() { // xml结构体序列化储存
return nil, loginInfo if err := resp.ScanXML(&loginInfo); err != nil {
} return nil, err
return &loginInfo, nil }
if !loginInfo.Ok() {
return nil, loginInfo
}
return &loginInfo, nil
} }
// 获取初始化信息 // 获取初始化信息
func (c *Caller) WebInit(request *BaseRequest) (*WebInitResponse, error) { func (c *Caller) WebInit(request *BaseRequest) (*WebInitResponse, error) {
resp := NewReturnResponse(c.Client.WebInit(request)) resp := NewReturnResponse(c.Client.WebInit(request))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
var webInitResponse WebInitResponse var webInitResponse WebInitResponse
defer resp.Body.Close() defer resp.Body.Close()
if err := resp.ScanJSON(&webInitResponse); err != nil { if err := resp.ScanJSON(&webInitResponse); err != nil {
return nil, err return nil, err
} }
return &webInitResponse, nil return &webInitResponse, nil
} }
// 通知手机已登录 // 通知手机已登录
func (c *Caller) WebWxStatusNotify(request *BaseRequest, response *WebInitResponse, info *LoginInfo) error { func (c *Caller) WebWxStatusNotify(request *BaseRequest, response *WebInitResponse, info *LoginInfo) error {
resp := NewReturnResponse(c.Client.WebWxStatusNotify(request, response, info)) resp := NewReturnResponse(c.Client.WebWxStatusNotify(request, response, info))
if resp.Err() != nil { if resp.Err() != nil {
return resp.Err() return resp.Err()
} }
var item struct{ BaseResponse BaseResponse } var item struct{ BaseResponse BaseResponse }
defer resp.Body.Close() defer resp.Body.Close()
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return err return err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return item.BaseResponse return item.BaseResponse
} }
return nil return nil
} }
// 异步获取是否有新的消息 // 异步获取是否有新的消息
func (c *Caller) SyncCheck(info *LoginInfo, response *WebInitResponse) (*SyncCheckResponse, error) { func (c *Caller) SyncCheck(info *LoginInfo, response *WebInitResponse) (*SyncCheckResponse, error) {
resp := NewReturnResponse(c.Client.SyncCheck(info, response)) resp := NewReturnResponse(c.Client.SyncCheck(info, response))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := resp.ReadAll() data, err := resp.ReadAll()
if err != nil { if err != nil {
return nil, err return nil, err
} }
results := syncCheckRegexp.FindSubmatch(data) results := syncCheckRegexp.FindSubmatch(data)
if len(results) != 3 { if len(results) != 3 {
return nil, errors.New("parse sync key failed") return nil, errors.New("parse sync key failed")
} }
retCode, selector := string(results[1]), string(results[2]) retCode, selector := string(results[1]), string(results[2])
syncCheckResponse := &SyncCheckResponse{RetCode: retCode, Selector: selector} syncCheckResponse := &SyncCheckResponse{RetCode: retCode, Selector: selector}
return syncCheckResponse, nil return syncCheckResponse, nil
} }
// 获取所有的联系人 // 获取所有的联系人
func (c *Caller) WebWxGetContact(info *LoginInfo) (Members, error) { func (c *Caller) WebWxGetContact(info *LoginInfo) (Members, error) {
resp := NewReturnResponse(c.Client.WebWxGetContact(info)) resp := NewReturnResponse(c.Client.WebWxGetContact(info))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item WebWxContactResponse var item WebWxContactResponse
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return nil, err return nil, err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return nil, item.BaseResponse return nil, item.BaseResponse
} }
return item.MemberList, nil return item.MemberList, nil
} }
// 获取联系人的详情 // 获取联系人的详情
// 注: Members参数的长度不要大于50 // 注: Members参数的长度不要大于50
func (c *Caller) WebWxBatchGetContact(members Members, request *BaseRequest) (Members, error) { func (c *Caller) WebWxBatchGetContact(members Members, request *BaseRequest) (Members, error) {
resp := NewReturnResponse(c.Client.WebWxBatchGetContact(members, request)) resp := NewReturnResponse(c.Client.WebWxBatchGetContact(members, request))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item WebWxBatchContactResponse var item WebWxBatchContactResponse
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return nil, err return nil, err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return nil, item.BaseResponse return nil, item.BaseResponse
} }
return item.ContactList, nil return item.ContactList, nil
} }
// 获取新的消息接口 // 获取新的消息接口
func (c *Caller) WebWxSync(request *BaseRequest, response *WebInitResponse, info *LoginInfo) (*WebWxSyncResponse, error) { func (c *Caller) WebWxSync(request *BaseRequest, response *WebInitResponse, info *LoginInfo) (*WebWxSyncResponse, error) {
resp := NewReturnResponse(c.Client.WebWxSync(request, response, info)) resp := NewReturnResponse(c.Client.WebWxSync(request, response, info))
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var webWxSyncResponse WebWxSyncResponse var webWxSyncResponse WebWxSyncResponse
if err := resp.ScanJSON(&webWxSyncResponse); err != nil { if err := resp.ScanJSON(&webWxSyncResponse); err != nil {
return nil, err return nil, err
} }
return &webWxSyncResponse, nil return &webWxSyncResponse, nil
} }
// 发送消息接口 // 发送消息接口
func (c *Caller) WebWxSendMsg(msg *SendMessage, info *LoginInfo, request *BaseRequest) (*SentMessage, error) { func (c *Caller) WebWxSendMsg(msg *SendMessage, info *LoginInfo, request *BaseRequest) (*SentMessage, error) {
resp, err := c.Client.WebWxSendMsg(msg, info, request) resp, err := c.Client.WebWxSendMsg(msg, info, request)
return getSuccessSentMessage(msg, resp, err) return getSuccessSentMessage(msg, resp, err)
} }
// 修改用户备注接口 // 修改用户备注接口
func (c *Caller) WebWxOplog(request *BaseRequest, remarkName, toUserName string) error { func (c *Caller) WebWxOplog(request *BaseRequest, remarkName, toUserName string) error {
resp := NewReturnResponse(c.Client.WebWxOplog(request, remarkName, toUserName)) resp := NewReturnResponse(c.Client.WebWxOplog(request, remarkName, toUserName))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
func (c *Caller) UploadMedia(file *os.File, request *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*UploadResponse, error) { func (c *Caller) UploadMedia(file *os.File, request *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*UploadResponse, error) {
// 首先尝试上传图片 // 首先尝试上传图片
resp := NewReturnResponse(c.Client.WebWxUploadMediaByChunk(file, request, info, fromUserName, toUserName)) resp := NewReturnResponse(c.Client.WebWxUploadMediaByChunk(file, request, info, fromUserName, toUserName))
// 无错误上传成功之后获取请求结果,判断结果是否正常 // 无错误上传成功之后获取请求结果,判断结果是否正常
if resp.Err() != nil { if resp.Err() != nil {
return nil, resp.Err() return nil, resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item UploadResponse var item UploadResponse
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return &item, err return &item, err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return &item, item.BaseResponse return &item, item.BaseResponse
} }
if len(item.MediaId) == 0 { if len(item.MediaId) == 0 {
return &item, errors.New("upload failed") return &item, errors.New("upload failed")
} }
return &item, nil return &item, nil
} }
// 发送图片消息接口 // 发送图片消息接口
func (c *Caller) WebWxSendImageMsg(file *os.File, request *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*SentMessage, error) { func (c *Caller) WebWxSendImageMsg(file *os.File, request *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*SentMessage, error) {
// 首先尝试上传图片 // 首先尝试上传图片
resp, err := c.UploadMedia(file, request, info, fromUserName, toUserName) resp, err := c.UploadMedia(file, request, info, fromUserName, toUserName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 构造新的图片类型的信息 // 构造新的图片类型的信息
msg := NewMediaSendMessage(ImageMessage, fromUserName, toUserName, resp.MediaId) msg := NewMediaSendMessage(ImageMessage, fromUserName, toUserName, resp.MediaId)
// 发送图片信息 // 发送图片信息
resp1, err := c.Client.WebWxSendMsgImg(msg, request, info) resp1, err := c.Client.WebWxSendMsgImg(msg, request, info)
return getSuccessSentMessage(msg, resp1, err) return getSuccessSentMessage(msg, resp1, err)
} }
func (c *Caller) WebWxSendFile(file *os.File, req *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*SentMessage, error) { func (c *Caller) WebWxSendFile(file *os.File, req *BaseRequest, info *LoginInfo, fromUserName, toUserName string) (*SentMessage, error) {
resp, err := c.UploadMedia(file, req, info, fromUserName, toUserName) resp, err := c.UploadMedia(file, req, info, fromUserName, toUserName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 构造新的文件类型的信息 // 构造新的文件类型的信息
stat, _ := file.Stat() stat, _ := file.Stat()
appMsg := NewFileAppMessage(stat, resp.MediaId) appMsg := NewFileAppMessage(stat, resp.MediaId)
content, err := appMsg.XmlByte() content, err := appMsg.XmlByte()
if err != nil { if err != nil {
return nil, err return nil, err
} }
msg := NewSendMessage(AppMessage, string(content), fromUserName, toUserName, "") msg := NewSendMessage(AppMessage, string(content), fromUserName, toUserName, "")
return c.WebWxSendAppMsg(msg, req) return c.WebWxSendAppMsg(msg, req)
} }
// 发送媒体消息 // 发送媒体消息
func (c *Caller) WebWxSendAppMsg(msg *SendMessage, req *BaseRequest) (*SentMessage, error) { func (c *Caller) WebWxSendAppMsg(msg *SendMessage, req *BaseRequest) (*SentMessage, error) {
resp, err := c.Client.WebWxSendAppMsg(msg, req) resp, err := c.Client.WebWxSendAppMsg(msg, req)
return getSuccessSentMessage(msg, resp, err) return getSuccessSentMessage(msg, resp, err)
} }
// 用户退出 // 用户退出
func (c *Caller) Logout(info *LoginInfo) error { func (c *Caller) Logout(info *LoginInfo) error {
resp := NewReturnResponse(c.Client.Logout(info)) resp := NewReturnResponse(c.Client.Logout(info))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 拉好友入群 // 拉好友入群
func (c *Caller) AddFriendIntoChatRoom(req *BaseRequest, info *LoginInfo, group *Group, friends ...*Friend) error { func (c *Caller) AddFriendIntoChatRoom(req *BaseRequest, info *LoginInfo, group *Group, friends ...*Friend) error {
if len(friends) == 0 { if len(friends) == 0 {
return errors.New("no friends found") return errors.New("no friends found")
} }
resp := NewReturnResponse(c.Client.AddMemberIntoChatRoom(req, info, group, friends...)) resp := NewReturnResponse(c.Client.AddMemberIntoChatRoom(req, info, group, friends...))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 从群聊中移除用户 // 从群聊中移除用户
func (c *Caller) RemoveFriendFromChatRoom(req *BaseRequest, info *LoginInfo, group *Group, users ...*User) error { func (c *Caller) RemoveFriendFromChatRoom(req *BaseRequest, info *LoginInfo, group *Group, users ...*User) error {
if len(users) == 0 { if len(users) == 0 {
return errors.New("no users found") return errors.New("no users found")
} }
resp := NewReturnResponse(c.Client.RemoveMemberFromChatRoom(req, info, group, users...)) resp := NewReturnResponse(c.Client.RemoveMemberFromChatRoom(req, info, group, users...))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 同意加好友请求 // 同意加好友请求
func (c *Caller) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyContent string) error { func (c *Caller) WebWxVerifyUser(storage *Storage, info RecommendInfo, verifyContent string) error {
resp := NewReturnResponse(c.Client.WebWxVerifyUser(storage, info, verifyContent)) resp := NewReturnResponse(c.Client.WebWxVerifyUser(storage, info, verifyContent))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 撤回消息操作 // 撤回消息操作
func (c *Caller) WebWxRevokeMsg(msg *SentMessage, request *BaseRequest) error { func (c *Caller) WebWxRevokeMsg(msg *SentMessage, request *BaseRequest) error {
resp := NewReturnResponse(c.Client.WebWxRevokeMsg(msg, request)) resp := NewReturnResponse(c.Client.WebWxRevokeMsg(msg, request))
return parseBaseResponseError(resp) return parseBaseResponseError(resp)
} }
// 处理响应返回的结果是否正常 // 处理响应返回的结果是否正常
func parseBaseResponseError(resp *ReturnResponse) error { func parseBaseResponseError(resp *ReturnResponse) error {
if resp.Err() != nil { if resp.Err() != nil {
return resp.Err() return resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var item struct{ BaseResponse BaseResponse } var item struct{ BaseResponse BaseResponse }
if err := resp.ScanJSON(&item); err != nil { if err := resp.ScanJSON(&item); err != nil {
return err return err
} }
if !item.BaseResponse.Ok() { if !item.BaseResponse.Ok() {
return item.BaseResponse return item.BaseResponse
} }
return nil return nil
} }
func parseMessageResponseError(resp *ReturnResponse, msg *SentMessage) error { func parseMessageResponseError(resp *ReturnResponse, msg *SentMessage) error {
if resp.Err() != nil { if resp.Err() != nil {
return resp.Err() return resp.Err()
} }
defer resp.Body.Close() defer resp.Body.Close()
var messageResp MessageResponse var messageResp MessageResponse
if err := resp.ScanJSON(&messageResp); err != nil { if err := resp.ScanJSON(&messageResp); err != nil {
return err return err
} }
if !messageResp.BaseResponse.Ok() { if !messageResp.BaseResponse.Ok() {
return messageResp.BaseResponse return messageResp.BaseResponse
} }
// 发送成功之后将msgId赋值给SendMessage // 发送成功之后将msgId赋值给SendMessage
msg.MsgId = messageResp.MsgID msg.MsgId = messageResp.MsgID
return nil return nil
} }
func getSuccessSentMessage(msg *SendMessage, resp *http.Response, err error) (*SentMessage, error) { func getSuccessSentMessage(msg *SendMessage, resp *http.Response, err error) (*SentMessage, error) {
returnResp := NewReturnResponse(resp, err) returnResp := NewReturnResponse(resp, err)
sendSuccessMsg := &SentMessage{SendMessage: msg} sendSuccessMsg := &SentMessage{SendMessage: msg}
err = parseMessageResponseError(returnResp, sendSuccessMsg) err = parseMessageResponseError(returnResp, sendSuccessMsg)
return sendSuccessMsg, err return sendSuccessMsg, err
} }

View File

@ -51,6 +51,8 @@ const (
// errors // errors
var ( var (
noSuchUserFoundError = errors.New("no such user found") noSuchUserFoundError = errors.New("no such user found")
missLocationHeader = errors.New("301 response missing Location header")
loginForbiddenError = errors.New("login forbidden")
) )
// ALL跟search函数搭配 // ALL跟search函数搭配