Merge pull request '增加群组创建、邀请与成员权限管理' (#20) from xhgit/group-membership into main
Reviewed-on: http://git.xhmcl.com/xhgit/XHChat/pulls/20
This commit was merged in pull request #20.
This commit is contained in:
commit
6b4c510815
13 files changed
+620
-5
No files matched your search
+5
-1
@@ -26,6 +26,8 @@
|
||||
| POST | /api/v1/mls-credential | 当前设备登记带认证密钥签名的 MLS 签名公钥 |
|
||||
| POST | /api/v1/attachments/{id}?recipient= | 已接受好友设备上传附件密文,使用 application/octet-stream,成功返回 204 |
|
||||
| GET | /api/v1/attachments/{id} | 原发送或接收设备获取附件密文 |
|
||||
| GET / POST | /api/v1/groups | 列出当前账号所属群组与邀请,或创建群组 |
|
||||
| GET / POST | /api/v1/groups/{id} | 查看群组详情或执行邀请、接受、拒绝、改名、升降管理员、移除、退出或解散 |
|
||||
| POST | /api/v1/contacts/{id}/devices/{device}/claim | 为当前设备原子领取一个联系人的未使用 KeyPackage |
|
||||
|
||||
用户名为 3–32 位 ASCII 字母、数字或下划线,忽略大小写。密码最少 12 个 Unicode 字符,最多 256 字节。platform 为 web 或 windows。公钥、签名和 challenge 使用无填充 Base64URL。设备使用 Ed25519 签名 UTF-8 字符串 `XHChat device authentication v1\n` 后紧接 challenge。该签名仅用于证明基础设备密钥持有权。
|
||||
@@ -40,4 +42,6 @@ MLS 凭据由标准 Base64 的 publicKey 和 signature 组成,使用 UTF-8 前
|
||||
|
||||
附件密文上限为 8 MiB 加 16 字节认证标签。重复提交相同 ID 和密文为幂等操作。附件按投递保留期清理,文件名和密钥只通过 MLS 消息传递。
|
||||
|
||||
下一阶段将增加 /conversations。后续加入 /groups、/calls、/posts、/backups、/push 与独立的管理接口。
|
||||
群组详情包含十进制字符串 membershipVersion。已接受成员变化会递增版本,待处理邀请和角色变化保留版本。active 成员可以查看其他有效成员,群主与管理员还可查看待处理邀请。群主可解散、调整管理员和移除成员。管理员可改名、邀请好友和移除普通成员。
|
||||
|
||||
下一阶段将增加 /conversations、群组密文投递、/calls、/posts、/backups、/push 与独立的管理接口。
|
||||
@@ -92,3 +92,7 @@ Windows 和 Web 使用 MediaRecorder 录制 Opus,支持取消、计时和最
|
||||
## 一次性密钥包补充
|
||||
|
||||
客户端启用加密聊天时补足四个可领取密钥包。聊天同步期间定时检查,接收新的 Welcome 后立即补充。私钥先落入本机加密记录,公网部分再上传。API 和双端测试验证密钥包领取后的计数变化,以及客户端收到 Welcome 后重新发布。
|
||||
|
||||
## 群组成员管理
|
||||
|
||||
Web 和 Windows 可创建群组、邀请已接受的联系人、接受或拒绝邀请、管理群名称及管理员、移除成员、退出与解散。未接受邀请的账号无法查看成员名单。成员加入和离开在事务内递增成员版本,后续 MLS 投递将以此拒绝过期名单。群组消息仍待接入。
|
||||
@@ -17,6 +17,7 @@ import (
|
||||
"xhchat/server/internal/contacts"
|
||||
"xhchat/server/internal/database"
|
||||
"xhchat/server/internal/delivery"
|
||||
"xhchat/server/internal/groups"
|
||||
"xhchat/server/internal/httpapi"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
@@ -85,7 +86,7 @@ func run() error {
|
||||
}
|
||||
}()
|
||||
server := &http.Server{
|
||||
Addr: cfg.Addr, Handler: httpapi.New(accounts, contacts.New(db), envelopes, cache, cfg.Origins, ready),
|
||||
Addr: cfg.Addr, Handler: httpapi.New(accounts, contacts.New(db), envelopes, groups.New(db), cache, cfg.Origins, ready),
|
||||
ReadHeaderTimeout: 5 * time.Second, ReadTimeout: 10 * time.Second,
|
||||
WriteTimeout: 15 * time.Second, IdleTimeout: 60 * time.Second, MaxHeaderBytes: 16 << 10,
|
||||
BaseContext: func(net.Listener) context.Context { return ctx },
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
CREATE TABLE chat_groups (
|
||||
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
name text NOT NULL CHECK (char_length(name) BETWEEN 1 AND 64),
|
||||
owner_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
membership_version bigint NOT NULL DEFAULT 1,
|
||||
created_at timestamptz NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
CREATE TABLE group_members (
|
||||
group_id uuid NOT NULL REFERENCES chat_groups(id) ON DELETE CASCADE,
|
||||
user_id uuid NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
state text NOT NULL CHECK (state IN ('invited', 'active')),
|
||||
role text NOT NULL DEFAULT 'member' CHECK (role IN ('member', 'admin')),
|
||||
PRIMARY KEY (group_id, user_id),
|
||||
CHECK (state = 'active' OR role = 'member')
|
||||
);
|
||||
|
||||
CREATE INDEX group_members_user ON group_members(user_id, group_id);
|
||||
@@ -25,6 +25,9 @@ var mlsCredentialsMigration string
|
||||
//go:embed 006_attachments.sql
|
||||
var attachmentsMigration string
|
||||
|
||||
//go:embed 007_groups.sql
|
||||
var groupsMigration string
|
||||
|
||||
func Migrate(ctx context.Context, pool *pgxpool.Pool) error {
|
||||
tx, err := pool.Begin(ctx)
|
||||
if err != nil {
|
||||
@@ -37,7 +40,7 @@ func Migrate(ctx context.Context, pool *pgxpool.Pool) error {
|
||||
if _, err = tx.Exec(ctx, "CREATE TABLE IF NOT EXISTS schema_migrations (version integer PRIMARY KEY)"); err != nil {
|
||||
return err
|
||||
}
|
||||
for index, migration := range []string{identityMigration, contactsMigration, deliveryMigration, keyPackagesMigration, mlsCredentialsMigration, attachmentsMigration} {
|
||||
for index, migration := range []string{identityMigration, contactsMigration, deliveryMigration, keyPackagesMigration, mlsCredentialsMigration, attachmentsMigration, groupsMigration} {
|
||||
version := index + 1
|
||||
var applied bool
|
||||
if err = tx.QueryRow(ctx, "SELECT EXISTS (SELECT 1 FROM schema_migrations WHERE version=$1)", version).Scan(&applied); err != nil {
|
||||
|
||||
@@ -0,0 +1,252 @@
|
||||
package groups
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
var ErrUnavailable = errors.New("group unavailable")
|
||||
var ErrAction = errors.New("group action unavailable")
|
||||
var ErrLimit = errors.New("group member limit reached")
|
||||
|
||||
type Group struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
State string `json:"state"`
|
||||
Role string `json:"role"`
|
||||
Version string `json:"membershipVersion"`
|
||||
}
|
||||
|
||||
type Member struct {
|
||||
ID string `json:"id"`
|
||||
Username string `json:"username"`
|
||||
State string `json:"state"`
|
||||
Role string `json:"role"`
|
||||
}
|
||||
|
||||
type Detail struct {
|
||||
Group
|
||||
Members []Member `json:"members"`
|
||||
}
|
||||
|
||||
type Change struct {
|
||||
Action string `json:"action"`
|
||||
Target string `json:"target"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type Store struct{ db *pgxpool.Pool }
|
||||
|
||||
func New(db *pgxpool.Pool) *Store { return &Store{db: db} }
|
||||
|
||||
func (s *Store) Create(ctx context.Context, owner, name string) (Group, error) {
|
||||
result := Group{Name: name, State: "active", Role: "owner", Version: "1"}
|
||||
err := s.db.QueryRow(ctx, `
|
||||
WITH created AS (INSERT INTO chat_groups(name,owner_id) VALUES($2,$1) RETURNING id)
|
||||
INSERT INTO group_members(group_id,user_id,state)
|
||||
SELECT id,$1,'active' FROM created RETURNING group_id
|
||||
`, owner, name).Scan(&result.ID)
|
||||
return result, err
|
||||
}
|
||||
|
||||
const groupRows = `
|
||||
SELECT g.id,g.name,m.state,CASE WHEN g.owner_id=m.user_id THEN 'owner' ELSE m.role END,g.membership_version::text
|
||||
FROM chat_groups g JOIN group_members m ON m.group_id=g.id WHERE m.user_id=$1
|
||||
`
|
||||
|
||||
func (s *Store) List(ctx context.Context, user string) ([]Group, error) {
|
||||
rows, err := s.db.Query(ctx, groupRows+" ORDER BY g.created_at DESC, g.id LIMIT 200", user)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
result := make([]Group, 0)
|
||||
for rows.Next() {
|
||||
var g Group
|
||||
if err := rows.Scan(&g.ID, &g.Name, &g.State, &g.Role, &g.Version); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result = append(result, g)
|
||||
}
|
||||
return result, rows.Err()
|
||||
}
|
||||
|
||||
func (s *Store) Detail(ctx context.Context, user, id string) (Detail, error) {
|
||||
result := Detail{Members: make([]Member, 0)}
|
||||
tx, err := s.db.BeginTx(ctx, pgx.TxOptions{IsoLevel: pgx.RepeatableRead, AccessMode: pgx.ReadOnly})
|
||||
if err != nil {
|
||||
return result, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
err = tx.QueryRow(ctx, groupRows+" AND g.id=$2", user, id).
|
||||
Scan(&result.ID, &result.Name, &result.State, &result.Role, &result.Version)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return result, ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return result, err
|
||||
}
|
||||
if result.State != "active" {
|
||||
return result, tx.Commit(ctx)
|
||||
}
|
||||
rows, err := tx.Query(ctx, `
|
||||
SELECT m.user_id,u.username,m.state,CASE WHEN m.user_id=g.owner_id THEN 'owner' ELSE m.role END
|
||||
FROM group_members m JOIN users u ON u.id=m.user_id JOIN chat_groups g ON g.id=m.group_id
|
||||
WHERE m.group_id=$1 AND (m.state='active' OR $2 IN ('owner','admin'))
|
||||
ORDER BY u.username
|
||||
`, id, result.Role)
|
||||
if err != nil {
|
||||
return result, err
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
var member Member
|
||||
if err := rows.Scan(&member.ID, &member.Username, &member.State, &member.Role); err != nil {
|
||||
return result, err
|
||||
}
|
||||
result.Members = append(result.Members, member)
|
||||
}
|
||||
if err = rows.Err(); err != nil {
|
||||
return result, err
|
||||
}
|
||||
return result, tx.Commit(ctx)
|
||||
}
|
||||
|
||||
func (s *Store) Change(ctx context.Context, user, id string, change Change) error {
|
||||
tx, err := s.db.Begin(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
// Serialize membership and version changes on the group row.
|
||||
var owner string
|
||||
err = tx.QueryRow(ctx, "SELECT owner_id FROM chat_groups WHERE id=$1 FOR UPDATE", id).Scan(&owner)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var state, role string
|
||||
err = tx.QueryRow(ctx, "SELECT state,role FROM group_members WHERE group_id=$1 AND user_id=$2", id, user).Scan(&state, &role)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if owner == user {
|
||||
role = "owner"
|
||||
}
|
||||
|
||||
activeChanged := false
|
||||
if state == "invited" {
|
||||
switch change.Action {
|
||||
case "accept":
|
||||
_, err = tx.Exec(ctx, "UPDATE group_members SET state='active' WHERE group_id=$1 AND user_id=$2", id, user)
|
||||
activeChanged = true
|
||||
case "decline":
|
||||
_, err = tx.Exec(ctx, "DELETE FROM group_members WHERE group_id=$1 AND user_id=$2", id, user)
|
||||
default:
|
||||
return ErrAction
|
||||
}
|
||||
} else {
|
||||
activeChanged, err = changeActive(ctx, tx, user, id, owner, role, change)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if activeChanged {
|
||||
if _, err = tx.Exec(ctx, "UPDATE chat_groups SET membership_version=membership_version+1 WHERE id=$1", id); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return tx.Commit(ctx)
|
||||
}
|
||||
|
||||
func changeActive(ctx context.Context, tx pgx.Tx, user, id, owner, role string, change Change) (bool, error) {
|
||||
manage := role == "owner" || role == "admin"
|
||||
switch change.Action {
|
||||
case "leave":
|
||||
if role == "owner" {
|
||||
return false, ErrAction
|
||||
}
|
||||
_, err := tx.Exec(ctx, "DELETE FROM group_members WHERE group_id=$1 AND user_id=$2", id, user)
|
||||
return true, err
|
||||
case "disband":
|
||||
if role != "owner" {
|
||||
return false, ErrAction
|
||||
}
|
||||
_, err := tx.Exec(ctx, "DELETE FROM chat_groups WHERE id=$1", id)
|
||||
return false, err
|
||||
case "rename":
|
||||
if !manage {
|
||||
return false, ErrAction
|
||||
}
|
||||
_, err := tx.Exec(ctx, "UPDATE chat_groups SET name=$2 WHERE id=$1", id, change.Name)
|
||||
return false, err
|
||||
case "invite":
|
||||
if !manage || change.Target == user {
|
||||
return false, ErrAction
|
||||
}
|
||||
return false, invite(ctx, tx, user, id, change.Target)
|
||||
case "remove", "promote", "demote":
|
||||
if !manage || change.Target == owner || change.Target == user {
|
||||
return false, ErrAction
|
||||
}
|
||||
return changeMember(ctx, tx, id, role, change)
|
||||
default:
|
||||
return false, ErrAction
|
||||
}
|
||||
}
|
||||
|
||||
func invite(ctx context.Context, tx pgx.Tx, user, id, target string) error {
|
||||
var count int
|
||||
if err := tx.QueryRow(ctx, "SELECT count(*) FROM group_members WHERE group_id=$1", id).Scan(&count); err != nil {
|
||||
return err
|
||||
}
|
||||
if count >= 32 {
|
||||
return ErrLimit
|
||||
}
|
||||
tag, err := tx.Exec(ctx, `
|
||||
INSERT INTO group_members(group_id,user_id,state)
|
||||
SELECT $1,$3,'invited' FROM contact_relationships
|
||||
WHERE first_user=LEAST($2::uuid,$3::uuid) AND second_user=GREATEST($2::uuid,$3::uuid)
|
||||
AND status='accepted'
|
||||
ON CONFLICT(group_id,user_id) DO NOTHING
|
||||
`, id, user, target)
|
||||
if err == nil && tag.RowsAffected() == 0 {
|
||||
return ErrAction
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func changeMember(ctx context.Context, tx pgx.Tx, id, role string, change Change) (bool, error) {
|
||||
if change.Action == "remove" {
|
||||
var state string
|
||||
err := tx.QueryRow(ctx, `
|
||||
DELETE FROM group_members WHERE group_id=$1 AND user_id=$2 AND ($3='owner' OR role='member')
|
||||
RETURNING state
|
||||
`, id, change.Target, role).Scan(&state)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return false, ErrAction
|
||||
}
|
||||
return state == "active", err
|
||||
}
|
||||
if role != "owner" {
|
||||
return false, ErrAction
|
||||
}
|
||||
next := "member"
|
||||
if change.Action == "promote" {
|
||||
next = "admin"
|
||||
}
|
||||
tag, err := tx.Exec(ctx, "UPDATE group_members SET role=$3 WHERE group_id=$1 AND user_id=$2 AND state='active'", id, change.Target, next)
|
||||
if err == nil && tag.RowsAffected() == 0 {
|
||||
return false, ErrAction
|
||||
}
|
||||
return false, err
|
||||
}
|
||||
@@ -16,6 +16,7 @@ import (
|
||||
"xhchat/server/internal/account"
|
||||
"xhchat/server/internal/contacts"
|
||||
"xhchat/server/internal/delivery"
|
||||
"xhchat/server/internal/groups"
|
||||
|
||||
"github.com/jackc/pgx/v5"
|
||||
"github.com/redis/go-redis/v9"
|
||||
@@ -25,14 +26,15 @@ type API struct {
|
||||
accounts *account.Store
|
||||
contacts *contacts.Store
|
||||
delivery *delivery.Store
|
||||
groups *groups.Store
|
||||
redis *redis.Client
|
||||
origins map[string]bool
|
||||
hashSlots chan struct{}
|
||||
ready func(context.Context) error
|
||||
}
|
||||
|
||||
func New(accounts *account.Store, contactStore *contacts.Store, envelopeStore *delivery.Store, cache *redis.Client, origins map[string]bool, ready func(context.Context) error) http.Handler {
|
||||
a := &API{accounts: accounts, contacts: contactStore, delivery: envelopeStore, redis: cache, origins: origins, hashSlots: make(chan struct{}, 4), ready: ready}
|
||||
func New(accounts *account.Store, contactStore *contacts.Store, envelopeStore *delivery.Store, groupStore *groups.Store, cache *redis.Client, origins map[string]bool, ready func(context.Context) error) http.Handler {
|
||||
a := &API{accounts: accounts, contacts: contactStore, delivery: envelopeStore, groups: groupStore, redis: cache, origins: origins, hashSlots: make(chan struct{}, 4), ready: ready}
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, _ *http.Request) { respond(w, 200, map[string]string{"status": "ok"}) })
|
||||
mux.HandleFunc("GET /readyz", a.readiness)
|
||||
@@ -58,6 +60,10 @@ func New(accounts *account.Store, contactStore *contacts.Store, envelopeStore *d
|
||||
mux.HandleFunc("POST /api/v1/attachments/{id}", a.authorized(a.uploadAttachment))
|
||||
mux.HandleFunc("GET /api/v1/attachments/{id}", a.authorized(a.downloadAttachment))
|
||||
mux.HandleFunc("GET /api/v1/mls-local-key", a.authorized(a.localMLSKey))
|
||||
mux.HandleFunc("GET /api/v1/groups", a.authorized(a.listGroups))
|
||||
mux.HandleFunc("POST /api/v1/groups", a.authorized(a.createGroup))
|
||||
mux.HandleFunc("GET /api/v1/groups/{id}", a.authorized(a.groupDetail))
|
||||
mux.HandleFunc("POST /api/v1/groups/{id}", a.authorized(a.changeGroup))
|
||||
return a.boundary(mux)
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"strings"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
|
||||
"xhchat/server/internal/account"
|
||||
"xhchat/server/internal/groups"
|
||||
)
|
||||
|
||||
func groupName(name string) bool {
|
||||
return name != "" && utf8.RuneCountInString(name) <= 64 && !strings.ContainsFunc(name, unicode.IsControl)
|
||||
}
|
||||
|
||||
func groupError(w http.ResponseWriter, err error) {
|
||||
switch {
|
||||
case errors.Is(err, groups.ErrUnavailable):
|
||||
problem(w, 404, "group_not_found", "群聊不可用")
|
||||
case errors.Is(err, groups.ErrAction):
|
||||
problem(w, 409, "group_action_unavailable", "当前无法执行此群操作")
|
||||
case errors.Is(err, groups.ErrLimit):
|
||||
problem(w, 409, "group_member_limit", "群成员与待处理邀请已达上限")
|
||||
default:
|
||||
unavailable(w, err)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *API) createGroup(w http.ResponseWriter, r *http.Request, _ string, id account.Identity) {
|
||||
var body struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
if !parse(w, r, &body) {
|
||||
return
|
||||
}
|
||||
name := strings.TrimSpace(body.Name)
|
||||
if !groupName(name) {
|
||||
problem(w, 400, "invalid_group_name", "群名称须为 1 至 64 个字符")
|
||||
return
|
||||
}
|
||||
if !a.limit(w, r, "group-create:"+id.User.ID, 10) {
|
||||
return
|
||||
}
|
||||
group, err := a.groups.Create(r.Context(), id.User.ID, name)
|
||||
if err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
respond(w, 201, group)
|
||||
}
|
||||
|
||||
func (a *API) listGroups(w http.ResponseWriter, r *http.Request, _ string, id account.Identity) {
|
||||
result, err := a.groups.List(r.Context(), id.User.ID)
|
||||
if err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
respond(w, 200, result)
|
||||
}
|
||||
|
||||
func (a *API) groupDetail(w http.ResponseWriter, r *http.Request, _ string, id account.Identity) {
|
||||
group := r.PathValue("id")
|
||||
if !uuidPattern.MatchString(group) {
|
||||
groupError(w, groups.ErrUnavailable)
|
||||
return
|
||||
}
|
||||
result, err := a.groups.Detail(r.Context(), id.User.ID, group)
|
||||
if err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
respond(w, 200, result)
|
||||
}
|
||||
|
||||
func (a *API) changeGroup(w http.ResponseWriter, r *http.Request, _ string, id account.Identity) {
|
||||
group := r.PathValue("id")
|
||||
if !uuidPattern.MatchString(group) {
|
||||
groupError(w, groups.ErrUnavailable)
|
||||
return
|
||||
}
|
||||
var change groups.Change
|
||||
if !parse(w, r, &change) {
|
||||
return
|
||||
}
|
||||
switch change.Action {
|
||||
case "invite", "remove", "promote", "demote":
|
||||
if !uuidPattern.MatchString(change.Target) {
|
||||
problem(w, 400, "invalid_member", "群成员 ID 无效")
|
||||
return
|
||||
}
|
||||
change.Target = strings.ToLower(change.Target)
|
||||
case "rename":
|
||||
change.Name = strings.TrimSpace(change.Name)
|
||||
if !groupName(change.Name) {
|
||||
problem(w, 400, "invalid_group_name", "群名称须为 1 至 64 个字符")
|
||||
return
|
||||
}
|
||||
case "accept", "decline", "leave", "disband":
|
||||
default:
|
||||
problem(w, 400, "invalid_group_action", "群操作无效")
|
||||
return
|
||||
}
|
||||
if !a.limit(w, r, "group-change:"+id.User.ID, 60) {
|
||||
return
|
||||
}
|
||||
if err := a.groups.Change(r.Context(), id.User.ID, group, change); err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
w.WriteHeader(204)
|
||||
}
|
||||
@@ -47,6 +47,48 @@ function frame() {
|
||||
return Buffer.concat([Buffer.from([0, 1, 0, 2]), randomBytes(96)]).toString('base64')
|
||||
}
|
||||
|
||||
test('群组邀请、授权、成员移除与版本变更', { timeout: 25_000 }, async () => {
|
||||
const owner = await register()
|
||||
const member = await register()
|
||||
const other = await register()
|
||||
const group = await json('/groups', 'POST', owner.token, { name: '发布验收群' }, 201)
|
||||
const path = '/groups/' + group.id
|
||||
const act = async (actor, action, target, expected = 204, name) => {
|
||||
const reply = await call(path, 'POST', actor.token, { action, target, name })
|
||||
assert.equal(reply.status, expected, await reply.text())
|
||||
}
|
||||
await json(path, 'GET', other.token, undefined, 404)
|
||||
await act(owner, 'invite', member.user.id, 409)
|
||||
await contact(owner, member, 'request')
|
||||
await contact(member, owner, 'accept')
|
||||
await act(owner, 'invite', member.user.id)
|
||||
const invitation = await json(path, 'GET', member.token)
|
||||
assert.equal(invitation.state, 'invited')
|
||||
assert.deepEqual(invitation.members, [])
|
||||
assert.equal(invitation.membershipVersion, '1')
|
||||
await act(member, 'decline')
|
||||
await json(path, 'GET', member.token, undefined, 404)
|
||||
await act(owner, 'invite', member.user.id)
|
||||
await act(member, 'accept')
|
||||
const active = await json(path, 'GET', member.token)
|
||||
assert.equal(active.membershipVersion, '2')
|
||||
assert.deepEqual(active.members.map((item) => item.role).sort(), ['member', 'owner'])
|
||||
await act(member, 'remove', owner.user.id, 409)
|
||||
await act(member, 'rename', undefined, 409, '未授权名称')
|
||||
await act(owner, 'promote', member.user.id)
|
||||
await act(member, 'rename', undefined, 204, '管理员改名')
|
||||
const renamed = await json(path, 'GET', owner.token)
|
||||
assert.equal(renamed.name, '管理员改名')
|
||||
assert.equal(renamed.membershipVersion, '2')
|
||||
await act(member, 'disband', undefined, 409)
|
||||
await act(owner, 'remove', member.user.id)
|
||||
await json(path, 'GET', member.token, undefined, 404)
|
||||
assert.deepEqual(await json('/groups', 'GET', member.token), [])
|
||||
assert.equal((await json(path, 'GET', owner.token)).membershipVersion, '3')
|
||||
await act(owner, 'disband')
|
||||
await json(path, 'GET', owner.token, undefined, 404)
|
||||
})
|
||||
|
||||
test('设备密文投递、幂等、离线补拉、实时提示和撤销', { timeout: 25000 }, async () => {
|
||||
const sender = await register()
|
||||
const recipient = await register()
|
||||
|
||||
@@ -6,6 +6,7 @@ import AuthView from './views/AuthView.vue'
|
||||
import DeviceView from './views/DeviceView.vue'
|
||||
import ContactsView from './views/ContactsView.vue'
|
||||
import ChatView from './views/ChatView.vue'
|
||||
import GroupView from './views/GroupView.vue'
|
||||
import Workspace from './views/Workspace.vue'
|
||||
import { useSession } from './session'
|
||||
import './style.css'
|
||||
@@ -20,6 +21,7 @@ const router = createRouter({
|
||||
{ path: 'devices', component: DeviceView },
|
||||
{ path: 'contacts', component: ContactsView },
|
||||
{ path: 'chat/:user?', component: ChatView },
|
||||
{ path: 'groups/:id?', component: GroupView },
|
||||
] },
|
||||
{ path: '/:pathMatch(.*)*', redirect: '/' },
|
||||
],
|
||||
|
||||
@@ -100,6 +100,8 @@ input { width: 100%; color: var(--text); background: var(--base); border: 1px so
|
||||
.conversation-list { display: grid; align-content: start; gap: 6px; padding: 14px; border-right: 1px solid var(--line); min-width: 0; }
|
||||
.conversation-list a { text-decoration: none; }
|
||||
.conversation-list a.router-link-exact-active { background: var(--green-soft); }
|
||||
.group-members { list-style: none; margin: 0; padding: 0; }
|
||||
.group-members li { padding: 8px 0; border-bottom: 1px solid var(--line); }
|
||||
@media (max-width: 840px) {
|
||||
.conversation-layout { grid-template-columns: minmax(0, 1fr); }
|
||||
.conversation-list { border-right: 0; border-bottom: 1px solid var(--line); max-height: 185px; overflow: auto; }
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { useSession } from '../session'
|
||||
import type { Contact } from '../contacts'
|
||||
|
||||
type Group = { id: string; name: string; state: 'active' | 'invited'; role: 'owner' | 'admin' | 'member'; membershipVersion: string }
|
||||
type Detail = Group & { members: { id: string; username: string; state: Group['state']; role: Group['role'] }[] }
|
||||
|
||||
const session = useSession()
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const groups = ref<Group[]>([])
|
||||
const contacts = ref<Contact[]>([])
|
||||
const detail = ref<Detail>()
|
||||
const term = ref('')
|
||||
const name = ref('')
|
||||
const nextName = ref('')
|
||||
const invite = ref('')
|
||||
const busy = ref(false)
|
||||
const error = ref('')
|
||||
const confirmation = ref<{ action: string; target?: string; label: string }>()
|
||||
const id = computed(() => typeof route.params.id === 'string' ? route.params.id : '')
|
||||
const visible = computed(() => groups.value.filter((group) => group.name.toLowerCase().includes(term.value.trim().toLowerCase())))
|
||||
const manage = computed(() => detail.value?.role === 'owner' || detail.value?.role === 'admin')
|
||||
const eligible = computed(() => contacts.value.filter((item) => item.state === 'friend' &&
|
||||
!detail.value?.members.some((member) => member.id === item.id)))
|
||||
const roles = { owner: '群主', admin: '管理员', member: '成员' }
|
||||
let timer: ReturnType<typeof setInterval>
|
||||
let revision = 0
|
||||
|
||||
async function refresh() {
|
||||
const version = ++revision
|
||||
const selected = id.value
|
||||
const list = await session.authorized<Group[]>('/groups')
|
||||
const next = list.some((group) => group.id === selected)
|
||||
? await session.authorized<Detail>('/groups/' + encodeURIComponent(selected))
|
||||
: undefined
|
||||
const friends = next?.role === 'owner' || next?.role === 'admin' ? await session.contacts() : []
|
||||
if (revision !== version || id.value !== selected) return
|
||||
groups.value = list
|
||||
if (detail.value?.id !== next?.id || detail.value?.name !== next?.name) nextName.value = next?.name ?? ''
|
||||
detail.value = next
|
||||
contacts.value = friends
|
||||
}
|
||||
|
||||
async function run(action: () => Promise<void>) {
|
||||
if (busy.value) return
|
||||
busy.value = true
|
||||
error.value = ''
|
||||
try {
|
||||
await action()
|
||||
} catch (cause) {
|
||||
error.value = cause instanceof Error ? cause.message : '群操作失败'
|
||||
} finally {
|
||||
busy.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function reload() {
|
||||
if (!busy.value) void run(refresh)
|
||||
}
|
||||
|
||||
function create() {
|
||||
void run(async () => {
|
||||
const created = await session.authorized<Group>('/groups', 'POST', { name: name.value })
|
||||
name.value = ''
|
||||
await router.push('/groups/' + created.id)
|
||||
await refresh()
|
||||
})
|
||||
}
|
||||
|
||||
function change(action: string, target?: string, value?: string) {
|
||||
const selected = detail.value?.id
|
||||
if (!selected) return
|
||||
void run(async () => {
|
||||
await session.authorized('/groups/' + selected, 'POST', { action, target, name: value })
|
||||
confirmation.value = undefined
|
||||
if (action === 'invite') invite.value = ''
|
||||
await refresh()
|
||||
})
|
||||
}
|
||||
|
||||
watch(id, () => {
|
||||
detail.value = undefined
|
||||
confirmation.value = undefined
|
||||
invite.value = ''
|
||||
if (busy.value) void refresh().catch(() => {})
|
||||
else reload()
|
||||
})
|
||||
onMounted(() => {
|
||||
reload()
|
||||
timer = setInterval(reload, 5000)
|
||||
})
|
||||
onBeforeUnmount(() => clearInterval(timer))
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="device-page">
|
||||
<header class="page-header"><h1>群组</h1><button class="plain" :disabled="busy" @click="reload">刷新</button></header>
|
||||
<div class="conversation-layout">
|
||||
<aside class="conversation-list" aria-label="群组列表">
|
||||
<form class="contact-search" @submit.prevent="create">
|
||||
<label>群名称<input v-model="name" required maxlength="64"></label>
|
||||
<button class="plain" :disabled="busy || !name.trim()">创建群组</button>
|
||||
</form>
|
||||
<label>查找群组<input v-model="term" type="search" maxlength="64"></label>
|
||||
<RouterLink v-for="group in visible" :key="group.id" class="contact-item" :to="'/groups/' + group.id">
|
||||
<span><strong>{{ group.name }}</strong><small>{{ group.state === 'invited' ? '待接受邀请' : roles[group.role] }}</small></span>
|
||||
</RouterLink>
|
||||
</aside>
|
||||
<div class="device-content chat-page">
|
||||
<p v-if="error" class="error" role="alert">{{ error }}</p>
|
||||
<template v-if="detail">
|
||||
<h2>{{ detail.name }}</h2>
|
||||
<template v-if="detail.state === 'invited'">
|
||||
<p>你收到一个群组邀请。</p>
|
||||
<div class="contact-actions">
|
||||
<button class="primary" :disabled="busy" @click="change('accept')">接受邀请</button>
|
||||
<button class="plain" :disabled="busy" @click="change('decline')">拒绝邀请</button>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<p class="muted">群消息尚未开放。</p>
|
||||
<form v-if="manage" class="contact-preferences" @submit.prevent="change('rename', undefined, nextName)">
|
||||
<label>修改群名称<input v-model="nextName" required maxlength="64"></label>
|
||||
<button class="plain" :disabled="busy || !nextName.trim() || nextName.trim() === detail.name">保存群名称</button>
|
||||
</form>
|
||||
<form v-if="manage" class="contact-preferences" @submit.prevent="change('invite', invite)">
|
||||
<label>邀请联系人
|
||||
<select v-model="invite" required>
|
||||
<option value="">选择联系人</option>
|
||||
<option v-for="item in eligible" :key="item.id" :value="item.id">{{ item.alias || item.username }}</option>
|
||||
</select>
|
||||
</label>
|
||||
<button class="plain" :disabled="busy || !invite">发送邀请</button>
|
||||
</form>
|
||||
<h3>群成员</h3>
|
||||
<ul class="group-members" aria-label="群成员">
|
||||
<li v-for="member in detail.members" :key="member.id">
|
||||
<span>{{ member.username }} · {{ member.state === 'invited' ? '待接受邀请' : roles[member.role] }}</span>
|
||||
<div class="message-actions" v-if="manage && member.role !== 'owner' && member.id !== session.identity?.user.id">
|
||||
<button v-if="detail.role === 'owner' && member.state === 'active'" class="plain" :disabled="busy"
|
||||
@click="change(member.role === 'admin' ? 'demote' : 'promote', member.id)">
|
||||
{{ member.role === 'admin' ? '取消管理员' : '设为管理员' }}
|
||||
</button>
|
||||
<button v-if="detail.role === 'owner' || member.role === 'member'" class="plain" :disabled="busy"
|
||||
@click="confirmation = { action: 'remove', target: member.id, label: member.state === 'invited' ? '撤销此邀请' : '移除此成员' }">
|
||||
{{ member.state === 'invited' ? '撤销邀请' : '移除成员' }}
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<button v-if="detail.role === 'owner'" class="plain" :disabled="busy" @click="confirmation = { action: 'disband', label: '解散群组' }">解散群组</button>
|
||||
<button v-else class="plain" :disabled="busy" @click="confirmation = { action: 'leave', label: '退出群组' }">退出群组</button>
|
||||
<div v-if="confirmation" class="confirmation">
|
||||
<p>确认{{ confirmation.label }}?</p>
|
||||
<button class="plain" :disabled="busy" @click="change(confirmation.action, confirmation.target)">确认操作</button>
|
||||
<button class="plain" @click="confirmation = undefined">取消</button>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
<p v-else-if="!error" class="muted">选择或创建群组。</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
@@ -37,6 +37,7 @@ async function act(action: () => Promise<void>) {
|
||||
<nav class="panel-links" aria-label="工作区">
|
||||
<RouterLink to="/chat">消息</RouterLink>
|
||||
<RouterLink to="/contacts">联系人</RouterLink>
|
||||
<RouterLink to="/groups">群组</RouterLink>
|
||||
<RouterLink to="/devices">设备管理</RouterLink>
|
||||
<button v-if="browser" class="plain mobile-browser" @click="act(browser)">浏览器</button>
|
||||
</nav>
|
||||
|
||||
Reference in new issue
Block a user