nixevol/NixMsg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 测试 WS 客户端按字节流拆包并恢复群事件同步下发

Browse Source
This commit is contained in:
Nixevol
2026-09-30 16:24:31 +08:00
parent 5f91a7758b
commit 09fb544b7d
6 changed files with 265 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/accept/rest_accept_test.go
+13 -41
View File
@@ -614,9 +614,6 @@ func runF15(t *testing.T, set func(string, report.Status, string)) {
}
// 拉进群仍要当次带对话密码（已有单聊授权不能代替）。
// 注：真实进程上 group.add+talk_password，以及长会话后再 group.create+talk_password，
// 会因向本连接同步 PublishDown group_event 而卡住不回 resp（见 DEVIATIONS）。
// 无密失败在本会话用 create 覆盖；带密成功在独立短生命周期进程上覆盖（同校验路径）。
alice.Request(t, map[string]any{
"v": 1, "type": "send", "rid": "f15s6", "id": "f15-reauth",
"to": map[string]any{"kind": "endpoint", "id": "f15bob001"},
@@ -650,9 +647,18 @@ func runF15(t *testing.T, set func(string, report.Status, string)) {
t.Errorf("expected member fail: %+v", addNo.Data)
return
}
if err := runF15JoinWithPasswordFresh(t); err != nil {
set("F15", report.StatusFail, "带密拉人建群: "+err.Error())
t.Error(err)
addYes := alice.Request(t, map[string]any{
"v": 1, "type": "group.add", "rid": "f15g2", "group_id": "g_f15a",
"members": []map[string]any{{"id": "f15bob001", "talk_password": "talk-secret-2"}},
})
if !addYes.OK {
set("F15", report.StatusFail, fmt.Sprintf("带密拉人失败: %+v", addYes))
t.Errorf("group.add pw: %+v", addYes)
return
}
if fails := memberFailures(addYes.Data); len(fails) > 0 {
set("F15", report.StatusFail, fmt.Sprintf("带密拉人仍失败: %+v", addYes.Data))
t.Errorf("group.add failed: %+v", addYes.Data)
return
}
@@ -700,7 +706,7 @@ func runF15(t *testing.T, set func(string, report.Status, string)) {
t.Errorf("still: %+v", still)
return
}
set("F15", report.StatusPass, "已测：不带密拒绝、带对后第二条免密、改密失效、对方先发可免密回、拉群须当次密码、5 账号×10 错触发总数锁后正确密也 rate_limited 且已有授权仍可发")
set("F15", report.StatusPass, "已测：不带密拒绝、带对后第二条免密、改密失效、对方先发可免密回、同一长会话 group.add 带密拉人成功、5 账号×10 错触发总数锁后正确密也 rate_limited 且已有授权仍可发")
}
func runF18(t *testing.T, set func(string, report.Status, string)) {
@@ -826,40 +832,6 @@ func runF18(t *testing.T, set func(string, report.Status, string)) {
set("F18", report.StatusPass, "已测：确认后 message_bodies 为空；同号重试不再投递；record_retention_days=0 完成后 status=not_found 且消息行消失")
}
// runF15JoinWithPasswordFresh 在干净进程上验证带对话密码建群成功（避开长会话后 PublishDown 卡住）。
func runF15JoinWithPasswordFresh(t *testing.T) error {
t.Helper()
srv, err := harness.Start(harness.Options{})
if err != nil {
return fmt.Errorf("harness: %w", err)
}
defer func() { _ = srv.Stop() }()
ac := accept.AdminLogin(t, srv)
accept.CreateEndpoint(t, ac, "f15jalice", epPassword)
accept.CreateEndpoint(t, ac, "f15jbob01", epPassword)
alice := accept.MQTTLogin(t, srv.HTTPBase, "f15jalice", epPassword)
defer alice.Close()
bob := accept.MQTTLogin(t, srv.HTTPBase, "f15jbob01", epPassword)
defer bob.Close()
setTalk := bob.Request(t, map[string]any{
"v": 1, "type": "self.talk_password", "rid": "jtp1", "talk_password": "join-secret",
})
if !setTalk.OK {
return fmt.Errorf("设对话密码失败: %+v", setTalk)
}
addYes := alice.Request(t, map[string]any{
"v": 1, "type": "group.create", "rid": "f15jg", "id": "g_f15j", "name": "F15J",
"members": []map[string]any{{"id": "f15jbob01", "talk_password": "join-secret"}},
})
if !addYes.OK {
return fmt.Errorf("带密建群失败: %+v", addYes)
}
if fails := memberFailures(addYes.Data); len(fails) > 0 {
return fmt.Errorf("带密建群仍失败: %+v", addYes.Data)
}
return nil
}
func drainReceipts(s *accept.MQTTSession, d time.Duration) {
deadline := time.Now().Add(d)
for time.Now().Before(deadline) {