design/11 §7.1(主人 2026-10-03 拍板)。此前 hub.broadcast 是全连接广播,而任意角色
(含 viewer)都能连 /ws/chat ⇒ viewer 能收到角色回复正文(message.*)、推理内容
(thinking.*)、消息增量、graph_update、mood 等。这与 design/19 §1/§3「flow 可视化仅
owner/admin 可见」冲突,也与 GET /sessions/{id}/messages 的 owner/admin 档位不一致。
收口:唯一分类点 internal/services/gateway/ws_frame_scope.go 的 frameReachesAll(typ)
(fail-closed switch,默认 false);hub.broadcast 投递前查表,白名单外对非 owner/admin
连接直接跳过。**不给 broadcast 加 bool 参数、不让调用点自己判断** —— 那正是"漏一处就是
泄漏"的形状。全包只有一个 fan-out 循环,14 个 .broadcast( 调用点全部落进该入口。
- 白名单只有 7 个状态机信号帧(不含任何内容):session_busy / pending_ack / pending_drain /
session_idle / session_interrupted / pending_full / session_read
- 其余全部(流式 message/thinking/tool_call、message_persisted/edited/deleted、graph_update、
subagent_event/result、task_output/task_done、automation_result、tool_used、capacity_awaken、
mode_switch、mood、device_update、reminder)仅 owner+admin
- 语义澄清:本门管「谁被主动推送」,数据可见性仍由 REST 决定(viewer 的 12 条只读监控端点
不变,含 GET /personas 的 mood);/ws/chat 连接鉴权与 voice_output 定向帧不动
契约:Docs/api-client.md → v0.48(对 viewer 是收紧;owner/admin 零变化;无端点/字段形状变更)
验证:go build/vet 绿;go test ./... = 58 包 ok / 0 FAIL;-race ./internal/services/gateway/... ok;
linux/amd64 + darwin/arm64 交叉编译绿。真 httptest WS + 真 JWT 按角色逐帧实测 37 帧:
viewer 只收到 7 个状态信号,owner/admin 37/37。
变异验证:① graph_update 加回白名单 → 真 WS 抓到 viewer 收到 graph_update,3 个测试 FAIL;
② session_idle 移出白名单 → 3 个测试 FAIL(viewer 等不到哨兵帧而超时)。均已还原。
遗留(已登记,待主人裁决):① 握手 history 回放对任意角色照发(viewer 连上即得主会话最近
50 条正文);② /ws/chat 上行未按角色授权(viewer 可发 chat = 真驱动模型并落库;
subagent_ask / task_output_query 的定向应答绕过本门)。
166 lines
5.8 KiB
Go
166 lines
5.8 KiB
Go
package gateway
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/auth"
|
|
"git.yeij.top/AskaEth/Cyrene_v2/internal/runtime/history"
|
|
)
|
|
|
|
// These tests cover the D3 realtime-sync contract: a successful message edit or
|
|
// delete must reach the account's other browsers as a WS frame, not only the client
|
|
// that issued the REST call (otherwise every other browser has to re-read to converge).
|
|
|
|
// TestPatchMessageBroadcastsEdited covers ①: PATCH /api/v1/messages/{id} answers 200
|
|
// and pushes exactly one `message_edited` frame scoped to the edited message's own
|
|
// session, carrying the new content (and the mode/createdAt a client renders with).
|
|
// The frame's data is the updated message DTO with thinking stripped, matching the
|
|
// message_persisted contract; the REST reply keeps thinking (owner/admin-only read).
|
|
func TestPatchMessageBroadcastsEdited(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
srv, ts, jwt, st := newHistoryEnv(t)
|
|
c := newOwnerConn(srv.hub, 32)
|
|
srv.hub.register(c)
|
|
sub, err := st.NewSubSession(ctx, "owner")
|
|
if err != nil {
|
|
t.Fatalf("new sub: %v", err)
|
|
}
|
|
tok := signAny(t, jwt, "acct", auth.RoleOwner)
|
|
|
|
seedMessage := func(sessionID string) history.Message {
|
|
t.Helper()
|
|
return seedFullMessage(t, st, history.Message{
|
|
SessionID: sessionID, Role: history.RoleUser, Content: "old body",
|
|
Mode: "chat", Thinking: "internal chain", CreatedAt: 1000,
|
|
})
|
|
}
|
|
for _, tc := range []struct {
|
|
name string
|
|
sessionID string
|
|
}{
|
|
{name: "main session", sessionID: history.MainSessionID},
|
|
{name: "sub session", sessionID: sub},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
msg := seedMessage(tc.sessionID)
|
|
resp, body := doReq(t, http.MethodPatch, ts.URL+"/api/v1/messages/"+msg.ID, map[string]any{"content": "new body"}, tok)
|
|
if resp.StatusCode != http.StatusOK {
|
|
t.Fatalf("patch status = %d, want 200 (body=%s)", resp.StatusCode, body)
|
|
}
|
|
// The REST reply is the full DTO for the issuing client.
|
|
var reply historyMessage
|
|
if err := json.Unmarshal(decodeBody(t, body)["data"], &reply); err != nil {
|
|
t.Fatalf("decode reply: %v (body=%s)", err, body)
|
|
}
|
|
if reply.Content != "new body" || reply.Thinking != "internal chain" {
|
|
t.Fatalf("reply = %+v, want edited content + kept thinking", reply)
|
|
}
|
|
|
|
ev := readFakeFrame(t, c)
|
|
if ev.Type != "message_edited" {
|
|
t.Fatalf("frame type = %q, want message_edited (frame=%+v)", ev.Type, ev)
|
|
}
|
|
if ev.SessionID != tc.sessionID {
|
|
t.Fatalf("frame sessionId = %q, want %q", ev.SessionID, tc.sessionID)
|
|
}
|
|
data, ok := ev.Data.(map[string]any)
|
|
if !ok {
|
|
t.Fatalf("frame data = %+v, want object", ev.Data)
|
|
}
|
|
if data["id"] != msg.ID || data["content"] != "new body" {
|
|
t.Fatalf("frame data = %+v, want id=%s content=new body", data, msg.ID)
|
|
}
|
|
if data["sessionId"] != tc.sessionID {
|
|
t.Fatalf("frame data.sessionId = %v, want %q", data["sessionId"], tc.sessionID)
|
|
}
|
|
if data["mode"] != "chat" {
|
|
t.Fatalf("frame data.mode = %v, want chat", data["mode"])
|
|
}
|
|
if _, isNum := data["createdAt"].(float64); !isNum {
|
|
t.Fatalf("frame data.createdAt = %v, want a number", data["createdAt"])
|
|
}
|
|
if _, leaked := data["thinking"]; leaked {
|
|
t.Fatalf("frame data = %+v, thinking must be stripped from the broadcast", data)
|
|
}
|
|
if err := connHasNoFrame(c); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestDeleteMessageBroadcastsDeleted covers ②: DELETE /api/v1/messages/{id} answers
|
|
// 200, really removes the row, and pushes one `message_deleted` frame carrying the id
|
|
// plus the owning session (read before the row disappears) so a remote browser can
|
|
// drop it without re-reading.
|
|
func TestDeleteMessageBroadcastsDeleted(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
srv, ts, jwt, st := newHistoryEnv(t)
|
|
c := newOwnerConn(srv.hub, 32)
|
|
srv.hub.register(c)
|
|
sub, err := st.NewSubSession(ctx, "owner")
|
|
if err != nil {
|
|
t.Fatalf("new sub: %v", err)
|
|
}
|
|
msg := seedFullMessage(t, st, history.Message{SessionID: sub, Role: history.RoleUser, Content: "to be removed", CreatedAt: 2000})
|
|
tok := signAny(t, jwt, "acct", auth.RoleOwner)
|
|
|
|
resp, body := doReq(t, http.MethodDelete, ts.URL+"/api/v1/messages/"+msg.ID, nil, tok)
|
|
if resp.StatusCode != http.StatusOK {
|
|
t.Fatalf("delete status = %d, want 200 (body=%s)", resp.StatusCode, body)
|
|
}
|
|
|
|
ev := readFakeFrame(t, c)
|
|
if ev.Type != "message_deleted" {
|
|
t.Fatalf("frame type = %q, want message_deleted (frame=%+v)", ev.Type, ev)
|
|
}
|
|
if ev.SessionID != sub {
|
|
t.Fatalf("frame sessionId = %q, want %q", ev.SessionID, sub)
|
|
}
|
|
data, ok := ev.Data.(map[string]any)
|
|
if !ok {
|
|
t.Fatalf("frame data = %+v, want object", ev.Data)
|
|
}
|
|
if data["id"] != msg.ID {
|
|
t.Fatalf("frame data.id = %v, want %s", data["id"], msg.ID)
|
|
}
|
|
if err := connHasNoFrame(c); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// The broadcast must not claim a delete that did not happen.
|
|
remaining, err := st.List(ctx, sub, 0, 50, "")
|
|
if err != nil {
|
|
t.Fatalf("list after delete: %v", err)
|
|
}
|
|
for _, m := range remaining {
|
|
if m.ID == msg.ID {
|
|
t.Fatalf("message %s still stored after a successful delete", msg.ID)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestDeleteMessageUnknownIDBroadcastsNothing pins the failure side: a 404 delete
|
|
// (unknown id) must not push a `message_deleted` frame, or a client would drop a
|
|
// message that still exists.
|
|
func TestDeleteMessageUnknownIDBroadcastsNothing(t *testing.T) {
|
|
t.Parallel()
|
|
srv, ts, jwt, _ := newHistoryEnv(t)
|
|
c := newOwnerConn(srv.hub, 32)
|
|
srv.hub.register(c)
|
|
tok := signAny(t, jwt, "acct", auth.RoleOwner)
|
|
|
|
resp, body := doReq(t, http.MethodDelete, ts.URL+"/api/v1/messages/msg-does-not-exist", nil, tok)
|
|
if resp.StatusCode != http.StatusNotFound {
|
|
t.Fatalf("delete status = %d, want 404 (body=%s)", resp.StatusCode, body)
|
|
}
|
|
if err := connHasNoFrame(c); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|