chore: sync upstream

Author: MisakaTAT

Dockerfile

@@ -42,3 +42,4 @@ WORKDIR /data
 VOLUME [ "/data" ]
 
 ENTRYPOINT [ "/docker-entrypoint.sh" ]
+CMD [ "/app/cqhttp" ]

cmd/gocq/login.go

@@ -14,26 +14,19 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/Mrs4s/MiraiGo/wrapper"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"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/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)
 
-func init() {
-	wrapper.DandelionEnergy = energy
-}
-
 func readLine() (str string) {
 	str, _ = console.ReadString('\n')
 	str = strings.TrimSpace(str)
@@ -222,9 +215,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 				log.Warnf("设备信息被封禁, 请删除 device.json 后重试.")
 			case 237:
 				log.Warnf("登录过于频繁, 请在手机QQ登录并根据提示完成认证后等一段时间重试")
-			case 45: // 在提供 t544 后还是出现45错误是需要强行升级到最新客户端或被限制非常用设备
-				log.Warnf("你的账号涉嫌违规被限制在非常用设备登录, 请在手机QQ登录并根据提示完成认证")
-				log.Warnf("或使用 -update-protocol 升级到最新协议后重试")
+			case 45:
+				log.Warnf("你的账号被限制登录, 请配置 SignServer 后重试")
 			}
 			log.Infof("按 Enter 继续....")
 			readLine()
@@ -274,32 +266,47 @@ func fetchCaptcha(id string) string {
 }
 
 func energy(uin uint64, id string, appVersion string, salt []byte) ([]byte, error) {
-	if localSigner, ok := encryption.T544Signer[appVersion]; ok {
-		log.Debugf("use local T544Signer v%s", appVersion)
-		result := localSigner(time.Now().UnixMicro(), salt)
-		log.Debugf("t544 sign result: %x", result)
-		return result, nil
-	}
-	log.Debugf("fallback to remote T544Signer v%s", appVersion)
-	signServer := "https://captcha.go-cqhttp.org/sdk/dandelion/energy"
-	if base.SignServerOverwrite != "" {
-		signServer = base.SignServerOverwrite
+	signServer := base.SignServer
+	if !strings.HasSuffix(signServer, "/") {
+		signServer += "/"
 	}
 	response, err := download.Request{
-		Method: http.MethodPost,
-		URL:    signServer,
-		Header: map[string]string{"Content-Type": "application/x-www-form-urlencoded"},
-		Body:   bytes.NewReader([]byte(fmt.Sprintf("uin=%v&id=%s&salt=%s&version=%s", uin, id, hex.EncodeToString(salt), appVersion))),
+		Method: http.MethodGet,
+		URL:    signServer + "custom_energy" + fmt.Sprintf("?data=%v&salt=%v", id, hex.EncodeToString(salt)),
 	}.Bytes()
 	if err != nil {
-		log.Errorf("获取T544时出现问题: %v", err)
+		log.Warnf("获取T544 sign时出现错误: %v server: %v", err, signServer)
 		return nil, err
 	}
-	sign, err := hex.DecodeString(gjson.GetBytes(response, "result").String())
-	if err != nil || len(sign) == 0 {
-		log.Errorf("获取T544时出现问题: %v", err)
+	data, err := hex.DecodeString(gjson.GetBytes(response, "data").String())
+	if err != nil {
+		log.Warnf("获取T544 sign时出现错误: %v", err)
 		return nil, err
 	}
-	log.Debugf("t544 sign result: %x", sign)
-	return sign, nil
+	if len(data) == 0 {
+		log.Warnf("获取T544 sign时出现错误: %v", "data is empty")
+		return nil, errors.New("data is empty")
+	}
+	return data, nil
+}
+
+func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
+	signServer := base.SignServer
+	if !strings.HasSuffix(signServer, "/") {
+		signServer += "/"
+	}
+	response, err := download.Request{
+		Method: http.MethodPost,
+		URL:    signServer + "sign",
+		Header: map[string]string{"Content-Type": "application/x-www-form-urlencoded"},
+		Body:   bytes.NewReader([]byte(fmt.Sprintf("uin=%v&qua=%s&cmd=%s&seq=%v&buffer=%v", uin, qua, cmd, seq, hex.EncodeToString(buff)))),
+	}.Bytes()
+	if err != nil {
+		log.Warnf("获取sso sign时出现错误: %v server: %v", err, signServer)
+		return nil, nil, nil, err
+	}
+	sign, _ = hex.DecodeString(gjson.GetBytes(response, "data.sign").String())
+	extra, _ = hex.DecodeString(gjson.GetBytes(response, "data.extra").String())
+	token, _ = hex.DecodeString(gjson.GetBytes(response, "data.token").String())
+	return sign, extra, token, nil
 }

cmd/gocq/main.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/wrapper"
 	para "github.com/fumiama/go-hide-param"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	"github.com/pkg/errors"
@@ -163,6 +164,14 @@ func LoginInteract() {
 		}
 	}
 
+	if base.SignServer != "-" && base.SignServer != "" {
+		log.Infof("使用服务器 %s 进行数据包签名", base.SignServer)
+		wrapper.DandelionEnergy = energy
+		wrapper.FekitGetSign = sign
+	} else {
+		log.Warnf("警告: 未配置签名服务器, 这可能会导致登录 45 错误码或发送消息被风控")
+	}
+
 	if base.Account.Encrypt {
 		if !global.PathExists("password.encrypt") {
 			if base.Account.Password == "" {

coolq/api.go

@@ -617,6 +617,7 @@ func (bot *CQBot) CQUploadPrivateFile(userID int64, file, name string) global.MS
 		log.Warnf("上传私聊文件 %v 失败: %+v", file, err)
 		return Failed(100, "OPEN_FILE_ERROR", "打开文件失败")
 	}
+	defer func() { _ = fileBody.Close() }()
 	localFile := &client.LocalFile{
 		FileName: name,
 		Body:     fileBody,

coolq/converter.go

@@ -92,7 +92,7 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
 			"name": m.Sender.AnonymousInfo.AnonymousNick,
 		}
 		gm["sender"].(global.MSG)["nickname"] = "匿名消息"
-		gm["sub_type"] = "anonymous"
+		typ = "message/group/anonymous"
 	} else {
 		group := bot.Client.FindGroup(m.GroupCode)
 		mem := group.FindMember(m.Sender.Uin)

coolq/cqcode.go

@@ -713,7 +713,7 @@ func (bot *CQBot) ConvertElement(spec *onebot.Spec, elem msg.Element, sourceType
 				MusicType:  message.CloudMusic,
 				Title:      info.Get("name").String(),
 				Summary:    artistName,
-				Url:        "https://y.music.163.com/m/song/" + id,
+				Url:        "https://music.163.com/song/?id=" + id,
 				PictureUrl: info.Get("album.picUrl").String(),
 				MusicUrl:   "https://music.163.com/song/media/outer/url?id=" + id,
 			}, nil

docker-entrypoint.sh

@@ -17,4 +17,4 @@ chown -R ${UID}:${GID} /app /data
 chmod +x /app/cqhttp
 
 echo "Starting..."
-su-exec ${USER} /app/cqhttp
+su-exec ${USER} "$@"

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/FloatTech/sqlite v1.5.7
 	github.com/Microsoft/go-winio v0.6.0
-	github.com/Mrs4s/MiraiGo v0.0.0-20230401072048-f8d9841755b5
+	github.com/Mrs4s/MiraiGo v0.0.0-20230627090859-19e3d172596e
 	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
 	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc
 	github.com/fumiama/go-base16384 v1.6.1
@@ -69,4 +69,4 @@ require (
 
 replace github.com/remyoudompheng/bigfft => github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b
 
-replace github.com/Mrs4s/MiraiGo => github.com/CodeLaboratory/MiraiGo v0.0.0-20230413080504-8adea49c27b5
+replace github.com/Mrs4s/MiraiGo => github.com/CodeLaboratory/MiraiGo v0.0.0-20230705011024-9614424df4d3

go.sum

@@ -1,5 +1,5 @@
-github.com/CodeLaboratory/MiraiGo v0.0.0-20230413080504-8adea49c27b5 h1:hRvl9EnHdL/smNj2mAShoiOuRALHDRy/4WePSOdOOBw=
-github.com/CodeLaboratory/MiraiGo v0.0.0-20230413080504-8adea49c27b5/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0=
+github.com/CodeLaboratory/MiraiGo v0.0.0-20230705011024-9614424df4d3 h1:xyUZGz1lyQS2UIRd/znddBlreKepD/M/TnT2BmqiK9Y=
+github.com/CodeLaboratory/MiraiGo v0.0.0-20230705011024-9614424df4d3/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0=
 github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk=
 github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=

internal/base/flag.go

@@ -38,7 +38,7 @@ var (
 	FastStart           bool   // 是否为快速启动
 	AllowTempSession    bool   // 是否允许发送临时会话信息
 	UpdateProtocol      bool   // 是否更新协议
-	SignServerOverwrite string // 使用特定的服务器进行签名
+	SignServer          string // 使用特定的服务器进行签名
 	HTTPTimeout         int
 
 	PostFormat        string                 // 上报格式 string or array
@@ -64,7 +64,6 @@ func Parse() {
 	d := flag.Bool("D", false, "debug mode")
 	flag.BoolVar(&FastStart, "faststart", false, "skip waiting 5 seconds")
 	flag.BoolVar(&UpdateProtocol, "update-protocol", false, "update protocol")
-	flag.StringVar(&SignServerOverwrite, "sign-server", "", "use special server to sign tlv")
 	flag.Parse()
 
 	if *d {
@@ -89,6 +88,7 @@ func Init() {
 		ReportSelfMessage = conf.Message.ReportSelfMessage
 		UseSSOAddress = conf.Account.UseSSOAddress
 		AllowTempSession = conf.Account.AllowTempSession
+		SignServer = conf.Account.SignServer
 		HTTPTimeout = conf.Message.HTTPTimeout
 	}
 	{ // others