Skip to content

Commit 3c03a30

Browse files
fumiamafumiama
committed
fix #421: 增加全局响应延迟与处理不及消息的丢弃
1 parent 7895e48 commit 3c03a30

File tree

4 files changed

+28
-20
lines changed

4 files changed

+28
-20
lines changed

‎README.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@
3636
## 命令行参数
3737
> `[]`代表是可选参数
3838
```bash
39-
zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [qq1 qq2 qq3 ...] [&]
39+
zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.json] [-l latency] [-r ringlen] [qq1 qq2 qq3 ...] [&]
4040
```
41-
- **-c config.json**: 从`config.json`加载`bot`配置
4241
- **-h**: 显示帮助
43-
- **-s config.json**: 保存现在`bot`配置到`config.json`
42+
- **-n nickname**: 设置默认昵称，默认为`椛椛`
4443
- **-t token**: 设置`AccessToken`，默认为空
4544
- **-u url**: 设置`Url`，默认为`ws://127.0.0.1:6700`
46-
- **-n nickname**: 设置默认昵称，默认为`椛椛`
4745
- **-p prefix**: 设置命令前缀，默认为`/`
4846
- **-d|w**: 开启 debug | warning 级别及以上日志输出
47+
- **-c config.json**: 从`config.json`加载`bot`配置
48+
- **-s config.json**: 保存现在`bot`配置到`config.json`
49+
- **-l latency**: 全局处理延时
50+
- **-r ringlen**: 接收消息环缓冲区大小
4951
- **qqs**: superusers 的 qq 号
5052
- **&**: 驻留在后台，必须放在最后，仅`Linux`下有效
5153

@@ -61,7 +63,9 @@ zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname]
6163
"アトリ"
6264
],
6365
"command_prefix": "/",
64-
"super_users": []
66+
"super_users": [],
67+
"ring_len": 4096,
68+
"latency": 1000000000
6569
},
6670
"ws": [
6771
{

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.19
55
require (
66
github.com/Baidu-AIP/golang-sdk v1.1.1
77
github.com/Coloured-glaze/gg v1.3.4
8-
github.com/FloatTech/AnimeAPI v1.5.2-0.20221028081617-456fa093d114
9-
github.com/FloatTech/floatbox v0.0.0-20221028081326-d9172706f1f7
8+
github.com/FloatTech/AnimeAPI v1.5.2-0.20221028093038-98709d071279
9+
github.com/FloatTech/floatbox v0.0.0-20221028092745-809ddc943dc0
1010
github.com/FloatTech/sqlite v0.5.0
1111
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
12-
github.com/FloatTech/zbpctrl v1.5.2-0.20221028081415-8f184b3a707c
13-
github.com/FloatTech/zbputils v1.5.1-0.20221028081539-c522900ba853
12+
github.com/FloatTech/zbpctrl v1.5.2-0.20221028092825-b625c5a2a853
13+
github.com/FloatTech/zbputils v1.5.1-0.20221028092951-30ec5e367a9f
1414
github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c
1515
github.com/antchfx/htmlquery v1.2.5
1616
github.com/corona10/goimagehash v1.1.0
@@ -32,7 +32,7 @@ require (
3232
github.com/sirupsen/logrus v1.9.0
3333
github.com/tidwall/gjson v1.14.3
3434
github.com/wcharczuk/go-chart/v2 v2.1.0
35-
github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221028080942-99b126551f62
35+
github.com/wdvxdr1123/ZeroBot v1.6.0
3636
gitlab.com/gomidi/midi/v2 v2.0.25
3737
golang.org/x/image v0.0.0-20220902085622-e7cb96979f69
3838
)

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
44
github.com/Coloured-glaze/gg v1.3.4 h1:l31zIF/HaVwkzjrj+A56RGQoSKyKuR1IWtIrqXGFStI=
55
github.com/Coloured-glaze/gg v1.3.4/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg=
66
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
7-
github.com/FloatTech/AnimeAPI v1.5.2-0.20221028081617-456fa093d114 h1:quxgXg90J7SouD4mN85dlkak0UogQq9OrFPRJdfbP+w=
8-
github.com/FloatTech/AnimeAPI v1.5.2-0.20221028081617-456fa093d114/go.mod h1:jY5L/55XzTzsrMOM9NT1mBYSB8crg4GBtLv8DAzftT0=
9-
github.com/FloatTech/floatbox v0.0.0-20221028081326-d9172706f1f7 h1:8LqHl3qyjeW818Yoeu+1QgvBCh3Zs+C0+xXvuSA8sf4=
10-
github.com/FloatTech/floatbox v0.0.0-20221028081326-d9172706f1f7/go.mod h1:Z901i9f5kFllw8K33id92ta0JX1L5BbVrQeIr/iFTnM=
7+
github.com/FloatTech/AnimeAPI v1.5.2-0.20221028093038-98709d071279 h1:+aLP25f/hfRIY6pot53c9ClAPBbZ7FZS2evIZCG4cFI=
8+
github.com/FloatTech/AnimeAPI v1.5.2-0.20221028093038-98709d071279/go.mod h1:38+tZ8CpFdWqFBRdvu3qaXvJ6cAXwd7zDld2HOSKbGo=
9+
github.com/FloatTech/floatbox v0.0.0-20221028092745-809ddc943dc0 h1:nrcNzMum4bakkRXVfUOBnvU303x/rGNk41Cu48aEuNs=
10+
github.com/FloatTech/floatbox v0.0.0-20221028092745-809ddc943dc0/go.mod h1:yVrepSPpjSjvHMd0jbxYqynqtbQQyjpu6ZgcaKaZ5Sc=
1111
github.com/FloatTech/sqlite v0.5.0 h1:U7J5Omc534PqmH6csfu+ypCo3DS8L91l5lTsxUu3b/U=
1212
github.com/FloatTech/sqlite v0.5.0/go.mod h1:i33d92OtR8jcp5fBUvQtospf27+MkfUxnGwnZ95E/dA=
1313
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
1414
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
15-
github.com/FloatTech/zbpctrl v1.5.2-0.20221028081415-8f184b3a707c h1:NpSazBc8HxVoFTxhEx8JMGLLLwNDpE8Gi3HDcbYC/To=
16-
github.com/FloatTech/zbpctrl v1.5.2-0.20221028081415-8f184b3a707c/go.mod h1:TBa9F/Jmbmu5d6d1zvdzm1vG0wcgT7bEYdwFT3G8nqc=
17-
github.com/FloatTech/zbputils v1.5.1-0.20221028081539-c522900ba853 h1:KPw8m6tCoWmBR13F0Oeu5jKTTk8Lty5JkKRijhbAIhw=
18-
github.com/FloatTech/zbputils v1.5.1-0.20221028081539-c522900ba853/go.mod h1:ZMzUkeRvEaCVP3TqMbI7pGs+/RBjvTIJOKuQgSZtW7I=
15+
github.com/FloatTech/zbpctrl v1.5.2-0.20221028092825-b625c5a2a853 h1:EeuIrd89B9Jxfd1+qPXQnOG36fo6qoxzFdP+NDzhzAA=
16+
github.com/FloatTech/zbpctrl v1.5.2-0.20221028092825-b625c5a2a853/go.mod h1:8CsLh37Dw11lyVGRm6K+sgGsQ2OWNPa/9XrZaK8ZyK0=
17+
github.com/FloatTech/zbputils v1.5.1-0.20221028092951-30ec5e367a9f h1:0HnQmEfWfE2C/+unhPwVk7lLHImxDD19ZUR9HlIDAV4=
18+
github.com/FloatTech/zbputils v1.5.1-0.20221028092951-30ec5e367a9f/go.mod h1:ohdbJJqUB56DaLIPAijMJYRMferi8VrS826iAbS29rk=
1919
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
2020
github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q=
2121
github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE=
@@ -193,8 +193,8 @@ github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//
193193
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
194194
github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
195195
github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
196-
github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221028080942-99b126551f62 h1:due0Ca890eg1vbB7ZvSTyxFn7377WQPZM4W1QLTYRGw=
197-
github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221028080942-99b126551f62/go.mod h1:shG/ruauisKaVcov4amrFJtkeDl7nl+Q00IXB2PqFsc=
196+
github.com/wdvxdr1123/ZeroBot v1.6.0 h1:RRDqRpDbB75TK9CCO63jfJkNBXvxmmhfXkdT0ZHdpmE=
197+
github.com/wdvxdr1123/ZeroBot v1.6.0/go.mod h1:shG/ruauisKaVcov4amrFJtkeDl7nl+Q00IXB2PqFsc=
198198
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
199199
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
200200
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=

‎main.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ func init() {
199199
prefix := flag.String("p", "/", "Set command prefix.")
200200
runcfg := flag.String("c", "", "Run from config file.")
201201
save := flag.String("s", "", "Save default config to file and exit.")
202+
late := flag.Uint("l", 1000, "Response latency.")
203+
rsz := flag.Uint("r", 4096, "Receiving buffer ring size.")
202204

203205
flag.Parse()
204206

@@ -251,6 +253,8 @@ func init() {
251253
NickName: append([]string{*adana}, "ATRI", "atri", "亚托莉", "アトリ"),
252254
CommandPrefix: *prefix,
253255
SuperUsers: sus,
256+
RingLen: *rsz,
257+
Latency: time.Duration(*late) * time.Millisecond,
254258
Driver: []zero.Driver{config.W[0]},
255259
}
256260

0 commit comments

Comments
 (0)