From a9b2910e66590939492856eb87f2f323b5704968 Mon Sep 17 00:00:00 2001 From: qydysky Date: Wed, 6 Jan 2021 00:26:02 +0800 Subject: [PATCH] =?utf8?q?=E6=95=88=E7=8E=87=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- CV/Var.go | 3 ++- README.md | 2 ++ Send/README.md | 1 + Send/Send_pm.go | 7 ++++--- bili_danmu.go | 10 +++++++--- demo/config/README.md | 1 + demo/face/0multi | Bin 0 -> 12063 bytes demo/face/README.md | 1 + demo/go.mod | 3 ++- demo/go.sum | 2 ++ demo/main.go | 8 ++++++++ 11 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 demo/face/0multi diff --git a/CV/Var.go b/CV/Var.go index 5c7daf9..c3341d8 100644 --- a/CV/Var.go +++ b/CV/Var.go @@ -29,7 +29,8 @@ type Danmu_Main_mq_item struct { Class string Data interface{} } -var Danmu_Main_mq = mq.New(10) +//200长度防止push击穿 +var Danmu_Main_mq = mq.New(200) //日志 var Log = log.New(log.Config{ diff --git a/README.md b/README.md index 1b0b101..066297b 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ golang go version go1.15.5 linux/amd64 - [github.com/christopher-dG/go-obs-websocket](https://github.com/christopher-dG/go-obs-websocket) under [MIT](https://raw.githubusercontent.com/christopher-dG/go-obs-websocket/master/LICENSE) - [github.com/gorilla/websocket](https://github.com/gorilla/websocket) under [BSD 2-Clause](https://raw.githubusercontent.com/gorilla/websocket/master/LICENSE) - [github.com/skip2/go-qrcode](https://github.com/skip2/go-qrcode) under [MIT](https://github.com/skip2/go-qrcode/blob/master/LICENSE) +- [github.com/gofrs/uuid](https://github.com/gofrs/uuid) under [MIT](https://github.com/gofrs/uuid/blob/master/LICENSE) - [7z](https://www.7-zip.org/) under [LICENSE](https://www.7-zip.org/license.txt) --- @@ -57,6 +58,7 @@ golang go version go1.15.5 linux/amd64 #### 当前支持功能 以下内容可能过时,点击查看[当前支持功能](https://github.com/qydysky/bili_danmu/blob/master/Reply/F.go#L16) +- [x] 自定义私信 - [x] 自动切换粉丝牌 - [x] 扫码登录 - [x] 自定义语音提醒 diff --git a/Send/README.md b/Send/README.md index 3df4e43..57d8724 100644 --- a/Send/README.md +++ b/Send/README.md @@ -5,4 +5,5 @@ |-|-| |./|弹幕发送| |Send.go|弹幕发送| +|Send_pm.go|私信发送| --- \ No newline at end of file diff --git a/Send/Send_pm.go b/Send/Send_pm.go index 71a631c..f74a5f2 100644 --- a/Send/Send_pm.go +++ b/Send/Send_pm.go @@ -19,13 +19,12 @@ type Pm_item struct { var pm_limit = p.Limit(1, 5000, 10000) func Send_pm(uid int, msg string) error { - if pm_limit.TO() {return errors.New("TO")} - log := c.Log.Base_add(`私信`) - if msg == `` || uid == 0 { return errors.New(`msg == "" || uid == 0`) } + log := c.Log.Base_add(`私信`) + if c.Uid == 0 { log.L(`E: `,`client uid == 0`) return errors.New(`client uid == 0`) @@ -56,6 +55,8 @@ func Send_pm(uid int, msg string) error { } } + if pm_limit.TO() {return errors.New("TO")} + var send_str = `msg[sender_uid]=`+strconv.Itoa(c.Uid)+`&msg[receiver_id]=`+strconv.Itoa(uid)+`&msg[receiver_type]=1&msg[msg_type]=1&msg[msg_status]=0&msg[content]={"content":"`+msg+`"}&msg[timestamp]=`+strconv.Itoa(int(p.Sys().GetSTime()))+`&msg[new_face_version]=0&msg[dev_id]=`+strings.ToUpper(new_uuid)+`&from_firework=0&build=0&mobi_app=web&csrf_token=`+csrf+`&csrf=`+csrf req := p.Req() diff --git a/bili_danmu.go b/bili_danmu.go index ae5d03a..00c980c 100644 --- a/bili_danmu.go +++ b/bili_danmu.go @@ -32,7 +32,7 @@ func Demo(roomid ...int) { if _,ok := c.Default_qn[*live_qn]; ok{c.Live_qn = *live_qn} var exit_sign bool - var change_room_chan = make(chan bool,1) + var change_room_chan = make(chan struct{}) go func(){ var room = *groomid @@ -51,7 +51,7 @@ func Demo(roomid ...int) { } if c.Roomid == 0 { c.Roomid = room - change_room_chan <- true + change_room_chan <- struct{}{} } }() @@ -65,7 +65,8 @@ func Demo(roomid ...int) { c.Uname = ``//主播id c.Title = `` reply.Saveflv_wait()//停止保存直播流 - change_room_chan <- true + for len(change_room_chan) != 0 {<-change_room_chan} + change_room_chan <- struct{}{} return false }, `c.Rev_add`:func(data interface{})(bool){//收入 @@ -82,6 +83,9 @@ func Demo(roomid ...int) { interrupt <- os.Interrupt return false }, + }) + //单独,避免队列执行耗时block从而无法接收更多消息 + c.Danmu_Main_mq.Pull_tag(map[string]func(interface{})(bool){ `pm`:func(data interface{})(bool){//私信 if tmp,ok := data.(send.Pm_item);ok{ send.Send_pm(tmp.Uid,tmp.Msg) diff --git a/demo/config/README.md b/demo/config/README.md index e37e7e3..3f2bcae 100644 --- a/demo/config/README.md +++ b/demo/config/README.md @@ -8,4 +8,5 @@ |config_disable_msg.json|禁用消息开关| |config_gtk_keep_key.json|gtk醒目提示时长| |config_tts.json|语音提示模板| +|config_K_v.json|Key-value键值设置| --- \ No newline at end of file diff --git a/demo/face/0multi b/demo/face/0multi new file mode 100644 index 0000000000000000000000000000000000000000..d390f51155e9d9d37d3572dbcc7a454013894698 GIT binary patch literal 12063 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 z zOB~sMHHHp|Xga&cpszdFeix}wQG_5EkH=6bMD&&6)UA}|gL&P(gJpuki^~=!1WB_z z-_EA_k3@A>Ra;B<81UYO&KX@qG0Ag`vJA3xa0Jn}qpVwm&Zvr*nMB3rWwCN~J-jcX zyQ=8S66>9t#_w#+SsV^WBUDulg)WlSKmGRCZ%kRYzJ;*ZI8`Nx8t+5v^7?wGD63CI zbwd^L>-4;{>o$o7m`t)}C?>BAli!%K?yAp=1SiTw9B0|IKblNFRM9Pkrmu5femA#O zhytT=hS6vOCfg(q;y0tL@A<>bAf34~05JQmR{RU~(5`al1%&-|BikTn1R002ov JPDHLkV1mgO#=8Ij literal 0 HcmV?d00001 diff --git a/demo/face/README.md b/demo/face/README.md index 8ab02b2..b772f71 100644 --- a/demo/face/README.md +++ b/demo/face/README.md @@ -14,4 +14,5 @@ |0room|房间消息时的头像| |0superchat|醒目留言时显示的头像| |0tianxuan|天选之人消息时显示的头像| +|0multi|多人消息时显示的头像| --- \ No newline at end of file diff --git a/demo/go.mod b/demo/go.mod index 95f06be..fdbbc80 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -11,7 +11,7 @@ require ( github.com/miekg/dns v1.1.35 // indirect github.com/mitchellh/mapstructure v1.4.0 // indirect github.com/qydysky/bili_danmu v0.5.7 - github.com/qydysky/part v0.3.5-0.20201228170623-c701da7df342 // indirect + github.com/qydysky/part v0.3.5-0.20210105160037-508c706d691b // indirect github.com/shirou/gopsutil v3.20.12+incompatible // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect @@ -22,4 +22,5 @@ require ( replace ( github.com/gotk3/gotk3 v0.5.2 => github.com/qydysky/gotk3 v0.0.0-20210103171910-327affdaaa80 github.com/qydysky/bili_danmu => ../ +//github.com/qydysky/part => ../../part ) diff --git a/demo/go.sum b/demo/go.sum index 2574424..8d811f3 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -101,6 +101,8 @@ github.com/qydysky/part v0.3.5-0.20201228153342-9ad523c2bef4 h1:0A7uj8u2PTn2DXea github.com/qydysky/part v0.3.5-0.20201228153342-9ad523c2bef4/go.mod h1:SxxNav0Z7DbsDLoG5uxo0wW5EKU/JBu2CAkZzZeLnX0= github.com/qydysky/part v0.3.5-0.20201228170623-c701da7df342 h1:7wCI40bHHgJ9+yByTqvLM7Jctz9Z5oMoK2AATHBHxaQ= github.com/qydysky/part v0.3.5-0.20201228170623-c701da7df342/go.mod h1:SxxNav0Z7DbsDLoG5uxo0wW5EKU/JBu2CAkZzZeLnX0= +github.com/qydysky/part v0.3.5-0.20210105160037-508c706d691b h1:rKR4PD/8CzT28Whf4ILQ4WZZW1S8MxJFSluYtrzu5+c= +github.com/qydysky/part v0.3.5-0.20210105160037-508c706d691b/go.mod h1:SxxNav0Z7DbsDLoG5uxo0wW5EKU/JBu2CAkZzZeLnX0= github.com/qydysky/part/msgq v0.0.0-20201213031129-ca3253dc72ad h1:Jtzf509lQrkUMGTV0Sc6IDCAiR1VrBcHrIban7hpye4= github.com/qydysky/part/msgq v0.0.0-20201213031129-ca3253dc72ad/go.mod h1:w32TkJNVtTJd4LOS09cq+4uYG6itcN2vsqw+slp44Rg= github.com/qydysky/part/msgq v0.0.0-20201213120821-f36e49c32bba h1:1ew9dRpc0Rux0WkWeT/4AE15ynYWmL2D7onJEJIFOB8= diff --git a/demo/main.go b/demo/main.go index f91f041..cd0204a 100644 --- a/demo/main.go +++ b/demo/main.go @@ -1,9 +1,17 @@ package main import ( + // "os" + // "runtime/pprof" q "github.com/qydysky/bili_danmu" ) func main() { + // f, _ := os.OpenFile("cpu.pprof", os.O_RDWR|os.O_CREATE, 0644) + // pprof.StartCPUProfile(f) + q.Demo() + + // pprof.StopCPUProfile() + // f.Close() } \ No newline at end of file -- 2.39.2