Merge branch 'dev'

cmd/gocq/login.go

@@ -15,18 +15,17 @@ import (
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/Mrs4s/MiraiGo/wrapper"
-	"github.com/Mrs4s/go-cqhttp/internal/encryption"
-	_ "github.com/Mrs4s/go-cqhttp/internal/encryption/t544"
 	"github.com/mattn/go-colorable"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"gopkg.ilharper.com/x/isatty"
 
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/Mrs4s/go-cqhttp/internal/download"
+	"github.com/Mrs4s/go-cqhttp/internal/encryption"
+	_ "github.com/Mrs4s/go-cqhttp/internal/encryption/t544" // side effect
 )
 
 var console = bufio.NewReader(os.Stdin)
@@ -218,8 +217,14 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
 			msg := res.ErrorMessage
 			log.Warnf("登录失败: %v Code: %v", msg, res.Code)
-			if res.Code == 235 {
-				log.Warnf("请删除 device.json 后重试.")
+			switch res.Code {
+			case 235:
+				log.Warnf("设备信息被封禁, 请删除 device.json 后重试.")
+			case 237:
+				log.Warnf("登录过于频繁, 请在手机QQ登录并根据提示完成认证后等一段时间重试")
+			case 45: // 在提供 t544 后还是出现45错误是需要强行升级到最新客户端或被限制非常用设备
+				log.Warnf("你的账号涉嫌违规被限制在非常用设备登录, 请在手机QQ登录并根据提示完成认证")
+				log.Warnf("或使用 -update-protocol 升级到最新协议后重试")
 			}
 			log.Infof("按 Enter 继续....")
 			readLine()

cmd/gocq/main.go

@@ -22,14 +22,13 @@ import (
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/term"
 
-	"github.com/Mrs4s/go-cqhttp/internal/download"
-
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/global/terminal"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 	"github.com/Mrs4s/go-cqhttp/internal/selfdiagnosis"
 	"github.com/Mrs4s/go-cqhttp/internal/selfupdate"
 	"github.com/Mrs4s/go-cqhttp/modules/servers"
@@ -168,51 +167,48 @@ func LoginInteract() {
 		if !global.PathExists("password.encrypt") {
 			if base.Account.Password == "" {
 				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
-				readLine()
-				os.Exit(0)
+			} else {
+				log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+				byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+				base.PasswordHash = md5.Sum([]byte(base.Account.Password))
+				_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
+				log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
 			}
-			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
-			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			base.PasswordHash = md5.Sum([]byte(base.Account.Password))
-			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
-			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
 			readLine()
 			os.Exit(0)
+		}
+		if base.Account.Password != "" {
+			log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
+			readLine()
+			os.Exit(0)
+		}
+		if len(byteKey) == 0 {
+			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+			cancel := make(chan struct{}, 1)
+			state, _ := term.GetState(int(os.Stdin.Fd()))
+			go func() {
+				select {
+				case <-cancel:
+					return
+				case <-time.After(time.Second * 45):
+					log.Infof("解密key输入超时")
+					time.Sleep(3 * time.Second)
+					_ = term.Restore(int(os.Stdin.Fd()), state)
+					os.Exit(0)
+				}
+			}()
+			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+			cancel <- struct{}{}
 		} else {
-			if base.Account.Password != "" {
-				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
-				readLine()
-				os.Exit(0)
-			}
-
-			if len(byteKey) == 0 {
-				log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
-				cancel := make(chan struct{}, 1)
-				state, _ := term.GetState(int(os.Stdin.Fd()))
-				go func() {
-					select {
-					case <-cancel:
-						return
-					case <-time.After(time.Second * 45):
-						log.Infof("解密key输入超时")
-						time.Sleep(3 * time.Second)
-						_ = term.Restore(int(os.Stdin.Fd()), state)
-						os.Exit(0)
-					}
-				}()
-				byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-				cancel <- struct{}{}
-			} else {
-				log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
-			}
+			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
+		}
 
-			encrypt, _ := os.ReadFile("password.encrypt")
-			ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
-			if err != nil {
-				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
-			}
-			copy(base.PasswordHash[:], ph)
+		encrypt, _ := os.ReadFile("password.encrypt")
+		ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
+		if err != nil {
+			log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
 		}
+		copy(base.PasswordHash[:], ph)
 	} else if len(base.Account.Password) > 0 {
 		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
 	}
@@ -368,6 +364,7 @@ func LoginInteract() {
 	})
 	saveToken()
 	cli.AllowSlider = true
+	download.SetTimeout(time.Duration(base.HTTPTimeout) * time.Second) // 在登录完成后设置, 防止在堵塞协议更新
 	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
 	log.Info("开始加载好友列表...")
 	global.Check(cli.ReloadFriendList(), true)
@@ -379,7 +376,6 @@ func LoginInteract() {
 		base.Account.Status = 0
 	}
 	cli.SetOnlineStatus(allowStatus[base.Account.Status])
-
 	servers.Run(coolq.NewQQBot(cli))
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")

coolq/api_v12.go

@@ -28,7 +28,7 @@ func (bot *CQBot) CQGetVersion() global.MSG {
 //
 // @route12(send_message)
 // @rename(m->message)
-func (bot *CQBot) CQSendMessageV12(groupID, userID, detailType string, m gjson.Result) global.MSG {
+func (bot *CQBot) CQSendMessageV12(groupID, userID, detailType string, m gjson.Result) global.MSG { // nolint
 	// TODO: implement
 	return OK(nil)
 }

coolq/event.go

@@ -136,7 +136,7 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	bot.dispatch(gm)
 }
 
-func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
+func (bot *CQBot) tempMessageEvent(_ *client.QQClient, e *client.TempMessageEvent) {
 	m := e.Message
 	bot.checkMedia(m.Elements, m.Sender.Uin)
 	source := message.Source{
@@ -491,7 +491,7 @@ func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent)
 	bot.dispatch(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
 }
 
-func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.MemberPermissionChangedEvent) {
+func (bot *CQBot) memberPermissionChangedEvent(_ *client.QQClient, e *client.MemberPermissionChangedEvent) {
 	st := "unset"
 	if e.NewPermission == client.Administrator {
 		st = "set"
@@ -502,7 +502,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 	})
 }
 
-func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
+func (bot *CQBot) memberCardUpdatedEvent(_ *client.QQClient, e *client.MemberCardUpdatedEvent) {
 	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
 	bot.dispatchEvent("notice/group_card", global.MSG{
 		"group_id": e.Group.Code,
@@ -526,7 +526,7 @@ func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGrou
 	bot.dispatch(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
 }
 
-func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequest) {
+func (bot *CQBot) friendRequestEvent(_ *client.QQClient, e *client.NewFriendRequest) {
 	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.friendReqCache.Store(flag, e)
@@ -537,15 +537,15 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 	})
 }
 
-func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) {
+func (bot *CQBot) friendAddedEvent(_ *client.QQClient, e *client.NewFriendEvent) {
 	log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
 	bot.tempSessionCache.Delete(e.Friend.Uin)
 	bot.dispatchEvent("notice/friend_add", global.MSG{
 		"user_id": e.Friend.Uin,
 	})
 }
 
-func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
+func (bot *CQBot) groupInvitedEvent(_ *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.dispatchEvent("request/group/invite", global.MSG{
@@ -557,7 +557,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 	})
 }
 
-func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
+func (bot *CQBot) groupJoinReqEvent(_ *client.QQClient, e *client.UserJoinGroupRequest) {
 	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.dispatchEvent("request/group/add", global.MSG{
@@ -569,7 +569,7 @@ func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupR
 	})
 }
 
-func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.OtherClientStatusChangedEvent) {
+func (bot *CQBot) otherClientStatusChangedEvent(_ *client.QQClient, e *client.OtherClientStatusChangedEvent) {
 	if e.Online {
 		log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
 	} else {

internal/base/flag.go

@@ -39,6 +39,7 @@ var (
 	AllowTempSession    bool   // 是否允许发送临时会话信息
 	UpdateProtocol      bool   // 是否更新协议
 	SignServerOverwrite string // 使用特定的服务器进行签名
+	HTTPTimeout         int
 
 	PostFormat        string                 // 上报格式 string or array
 	Proxy             string                 // 存储 proxy_rewrite,用于设置代理
@@ -88,6 +89,7 @@ func Init() {
 		ReportSelfMessage = conf.Message.ReportSelfMessage
 		UseSSOAddress = conf.Account.UseSSOAddress
 		AllowTempSession = conf.Account.AllowTempSession
+		HTTPTimeout = conf.Message.HTTPTimeout
 	}
 	{ // others
 		Proxy = conf.Message.ProxyRewrite

internal/download/download.go

@@ -4,6 +4,7 @@ package download
 import (
 	"bufio"
 	"compress/gzip"
+	"crypto/tls"
 	"fmt"
 	"io"
 	"net/http"
@@ -22,18 +23,31 @@ import (
 
 var client = &http.Client{
 	Transport: &http.Transport{
-		Proxy: func(request *http.Request) (u *url.URL, e error) {
+		Proxy: func(request *http.Request) (*url.URL, error) {
 			if base.Proxy == "" {
 				return http.ProxyFromEnvironment(request)
 			}
 			return url.Parse(base.Proxy)
 		},
-		ForceAttemptHTTP2:   false,
-		MaxConnsPerHost:     0,
-		MaxIdleConns:        0,
+		// Disable http2
+		TLSNextProto:        map[string]func(authority string, c *tls.Conn) http.RoundTripper{},
 		MaxIdleConnsPerHost: 999,
 	},
-	Timeout: time.Second * 15,
+	Timeout: time.Second * 5,
+}
+
+var clienth2 = &http.Client{
+	Transport: &http.Transport{
+		Proxy: func(request *http.Request) (*url.URL, error) {
+			if base.Proxy == "" {
+				return http.ProxyFromEnvironment(request)
+			}
+			return url.Parse(base.Proxy)
+		},
+		ForceAttemptHTTP2:   true,
+		MaxIdleConnsPerHost: 999,
+	},
+	Timeout: time.Second * 5,
 }
 
 // ErrOverSize 响应主体过大时返回此错误
@@ -42,6 +56,15 @@ var ErrOverSize = errors.New("oversize")
 // UserAgent HTTP请求时使用的UA
 const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
 
+// SetTimeout set internal/download client timeout
+func SetTimeout(t time.Duration) {
+	if t == 0 {
+		t = time.Second * 10
+	}
+	client.Timeout = t
+	clienth2.Timeout = t
+}
+
 // Request is a file download request
 type Request struct {
 	Method string
@@ -51,6 +74,13 @@ type Request struct {
 	Body   io.Reader
 }
 
+func (r Request) client() *http.Client {
+	if strings.Contains(r.URL, "go-cqhttp.org") {
+		return clienth2
+	}
+	return client
+}
+
 func (r Request) do() (*http.Response, error) {
 	if r.Method == "" {
 		r.Method = http.MethodGet
@@ -65,7 +95,7 @@ func (r Request) do() (*http.Response, error) {
 		req.Header.Set(k, v)
 	}
 
-	return client.Do(req)
+	return r.client().Do(req)
 }
 
 func (r Request) body() (io.ReadCloser, error) {