fix concurrent write panic #6

add: simple debug.

README.md

@@ -13,6 +13,7 @@
 - [x] 反向Websocket
 
 #### 拓展支持
+> 拓展API可前往 [文档](docs/cqhttp.md) 查看
 - [x] HTTP POST多点上报
 - [x] 反向WS多点连接 
 - [x] 修改群名
@@ -68,6 +69,7 @@
 | [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) |
 | [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) |
 | [群禁言](https://cqhttp.cc/docs/4.15/#/Post?id=群禁言)       |
+| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传)|
 | [加好友请求](https://cqhttp.cc/docs/4.15/#/Post?id=加好友请求) |
 | [加群请求/邀请](https://cqhttp.cc/docs/4.15/#/Post?id=加群请求／邀请) |
 

coolq/api.go

@@ -407,7 +407,7 @@ func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
 		r = append(r, MSG{
 			"sender": MSG{
 				"user_id":  n.SenderId,
-				"nick":    n.SenderName,
+				"nickname": n.SenderName,
 			},
 			"time":    n.Time,
 			"content": ToStringMessage(n.Message, 0, false),

coolq/event.go

@@ -40,6 +40,26 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
 	checkImage(m.Elements)
+	for _, elem := range m.Elements {
+		if file, ok := elem.(*message.GroupFileElement); ok {
+			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
+			bot.dispatchEventMessage(MSG{
+				"post_type":   "notice",
+				"notice_type": "group_upload",
+				"group_id":    m.GroupCode,
+				"user_id":     m.Sender.Uin,
+				"file": MSG{
+					"id":    file.Path,
+					"name":  file.Name,
+					"size":  file.Size,
+					"busid": file.Busid,
+				},
+				"self_id": c.Uin,
+				"time":    time.Now().Unix(),
+			})
+			return
+		}
+	}
 	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
 	id := m.Id
 	if bot.db != nil {

global/config.go

@@ -16,6 +16,7 @@ type JsonConfig struct {
 	WSConfig       *GoCQWebsocketConfig          `json:"ws_config"`
 	ReverseServers []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"`
 	Proxy          string                        `json:"proxy"`
+	Debug          bool                          `json:"debug"`
 }
 
 type CQHttpApiConfig struct {

go.mod

@@ -3,7 +3,7 @@ module github.com/Mrs4s/go-cqhttp
 go 1.14
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20200729044443-98a77a6cf354
+	github.com/Mrs4s/MiraiGo v0.0.0-20200730113850-298c1bb9119f
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
 	github.com/guonaihong/gout v0.1.1

go.sum

@@ -1,11 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200727124316-9d432df098d9 h1:sgwJQnKKAJF/FCXyGv5HHpE5BcKGnwGyCSmPKTB7/vE=
-github.com/Mrs4s/MiraiGo v0.0.0-20200727124316-9d432df098d9/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200728112613-91aa75e8270d h1:Pv8lvODPBb+By7CU1crF0/KrmwIrUb4W/3jTs9WDSN4=
-github.com/Mrs4s/MiraiGo v0.0.0-20200728112613-91aa75e8270d/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200729044443-98a77a6cf354 h1:f2Cv15Nir9tcefrvwD0+imVx1RQAw2TQI7LFipPUzrI=
-github.com/Mrs4s/MiraiGo v0.0.0-20200729044443-98a77a6cf354/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
+github.com/Mrs4s/MiraiGo v0.0.0-20200730113850-298c1bb9119f h1:+MW9qbGu9uWJc9vs6m8+8oQLh9nK6RCW2wk3BX7Z14c=
+github.com/Mrs4s/MiraiGo v0.0.0-20200730113850-298c1bb9119f/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
 github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
 github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=

main.go

@@ -85,6 +85,10 @@ func main() {
 	if conf.Uin == 0 || conf.Password == "" {
 		log.Fatal("请修改 config.json 以添加账号密码.")
 	}
+	if conf.Debug {
+		log.SetLevel(log.DebugLevel)
+		log.Warnf("已开启Debug模式.")
+	}
 	if !global.PathExists("device.json") {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备，按 Enter 继续.")
 		_, _ = console.ReadString('\n')

server/websocket.go

@@ -164,13 +164,15 @@ func (c *websocketClient) listenApi(conn *wsc.Conn, u bool) {
 		}
 		j := gjson.ParseBytes(buf[:l])
 		t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
-		//log.Infof("调用API: %v p: %v", t, j.Get("params").Raw)
+		log.Debugf("反向WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
 		if f, ok := wsApi[t]; ok {
 			ret := f(c.bot, j.Get("params"))
 			if j.Get("echo").Exists() {
 				ret["echo"] = j.Get("echo").Value()
 			}
+			c.pushLock.Lock()
 			_, _ = conn.Write([]byte(ret.ToJson()))
+			c.pushLock.Unlock()
 		}
 	}
 	if c.conf.ReverseReconnectInterval != 0 {
@@ -187,6 +189,7 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
 	c.pushLock.Lock()
 	defer c.pushLock.Unlock()
 	if c.eventConn != nil {
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson())
 		if _, err := c.eventConn.Write([]byte(m.ToJson())); err != nil {
 			_ = c.eventConn.Close()
 			if c.conf.ReverseReconnectInterval != 0 {
@@ -196,6 +199,7 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
 		}
 	}
 	if c.universalConn != nil {
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJson())
 		_, _ = c.universalConn.Write([]byte(m.ToJson()))
 	}
 }
@@ -268,13 +272,15 @@ func (s *websocketServer) listenApi(c *websocket.Conn) {
 		if t == websocket.TextMessage {
 			j := gjson.ParseBytes(payload)
 			t := strings.ReplaceAll(j.Get("action").Str, "_async", "") //TODO: async support
-			//log.Infof("API调用: %v", j.Get("action").Str)
+			log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
 			if f, ok := wsApi[t]; ok {
 				ret := f(s.bot, j.Get("params"))
 				if j.Get("echo").Exists() {
 					ret["echo"] = j.Get("echo").Value()
 				}
+				s.pushLock.Lock()
 				_ = c.WriteJSON(ret)
+				s.pushLock.Unlock()
 			}
 		}
 	}
@@ -285,6 +291,7 @@ func (s *websocketServer) onBotPushEvent(m coolq.MSG) {
 	defer s.pushLock.Unlock()
 	pos := 0
 	for _, conn := range s.eventConn {
+		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJson())
 		err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson()))
 		if err != nil {
 			_ = conn.Close()